diff options
| author | Thomas Haller <thaller@redhat.com> | 2022-04-14 13:59:21 (GMT) |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2022-04-14 13:59:21 (GMT) |
| commit | cacaa5fd2f583e3c3fd2bc7f6439948cf056c9a2 (patch) | |
| tree | 143b65919aff1b59c2c590d393839dac41651a0e | |
| parent | 855c02f332f0f79f6396318beee00cce7d4bbe4e (diff) | |
| download | libnl-cacaa5fd2f583e3c3fd2bc7f6439948cf056c9a2.zip libnl-cacaa5fd2f583e3c3fd2bc7f6439948cf056c9a2.tar.gz libnl-cacaa5fd2f583e3c3fd2bc7f6439948cf056c9a2.tar.bz2 | |
libnl-3.6.0 releaselibnl3_6_0
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/configure.ac | 2 | ||||
| -rw-r--r-- | include/netlink/utils.h | 6 | ||||
| -rw-r--r-- | lib/utils.c | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index ed8c104..1f9ad0e 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ # copied from glib m4_define([libnl_major_version], [3]) -m4_define([libnl_minor_version], [5]) +m4_define([libnl_minor_version], [6]) m4_define([libnl_micro_version], [0]) m4_define([libnl_git_sha], [m4_esyscmd([ ( [ -d ./.git/ ] && [ "$(readlink -f ./.git/)" = "$(readlink -f "$(git rev-parse --git-dir 2>/dev/null)" 2>/dev/null)" ] && git rev-parse --verify -q HEAD 2>/dev/null ) || true ])]) diff --git a/doc/configure.ac b/doc/configure.ac index 5324232..925c805 100644 --- a/doc/configure.ac +++ b/doc/configure.ac @@ -3,7 +3,7 @@ # Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch> # -AC_INIT(libnl-doc, [3.5.0], [http://www.infradead.org/~tgr/libnl/]) +AC_INIT(libnl-doc, [3.6.0], [http://www.infradead.org/~tgr/libnl/]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([foreign]) diff --git a/include/netlink/utils.h b/include/netlink/utils.h index 071929e..08be8e5 100644 --- a/include/netlink/utils.h +++ b/include/netlink/utils.h @@ -301,6 +301,12 @@ enum { NL_CAPABILITY_NL_OBJECT_IDENTICAL_PARTIAL = 31, #define NL_CAPABILITY_NL_OBJECT_IDENTICAL_PARTIAL NL_CAPABILITY_NL_OBJECT_IDENTICAL_PARTIAL + /** + * The library version is libnl3 3.6.0 or newer. This capability should never be backported. + */ + NL_CAPABILITY_VERSION_3_6_0 = 32, +#define NL_CAPABILITY_VERSION_3_6_0 NL_CAPABILITY_VERSION_3_6_0 + __NL_CAPABILITY_MAX, NL_CAPABILITY_MAX = (__NL_CAPABILITY_MAX - 1), #define NL_CAPABILITY_MAX NL_CAPABILITY_MAX diff --git a/lib/utils.c b/lib/utils.c index 1448931..124a458 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -1218,7 +1218,7 @@ int nl_has_capability (int capability) NL_CAPABILITY_ROUTE_FIX_VLAN_SET_EGRESS_MAP, NL_CAPABILITY_VERSION_3_5_0, NL_CAPABILITY_NL_OBJECT_IDENTICAL_PARTIAL, - 0), + NL_CAPABILITY_VERSION_3_6_0), /* IMPORTANT: these capability numbers are intended to be universal and stable * for libnl3. Don't allocate new numbers on your own that differ from upstream * libnl3. |