diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-03-30 11:17:17 (GMT) |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-03-30 11:17:17 (GMT) |
| commit | 8f5c65beee10598eb3264494963773e7b44a85e5 (patch) | |
| tree | 4865c66deedcc724a838d1bbaacab1163589ef37 | |
| parent | 31d7d193934ba14ac9102b6966c8863b3676e6d4 (diff) | |
| download | libnl-8f5c65beee10598eb3264494963773e7b44a85e5.zip libnl-8f5c65beee10598eb3264494963773e7b44a85e5.tar.gz libnl-8f5c65beee10598eb3264494963773e7b44a85e5.tar.bz2 | |
libnl-3.2.26 releaselibnl3_2_26
Signed-off-by: Thomas Haller <thaller@redhat.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/configure.ac | 2 | ||||
| -rw-r--r-- | include/netlink/utils.h | 8 | ||||
| -rw-r--r-- | lib/utils.c | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 751683d..4ea272b 100644 --- a/configure.ac +++ b/configure.ac @@ -40,7 +40,7 @@ m4_define([libnl_lt_revision], [0]) m4_define([libnl_lt_age], [21]) m4_define([libnl_version], - [libnl_major_version.libnl_minor_version.libnl_micro_version-rc1]) + [libnl_major_version.libnl_minor_version.libnl_micro_version]) AC_INIT(libnl, [libnl_version], [], [], [http://www.infradead.org/~tgr/libnl/]) AC_CONFIG_HEADERS([lib/defs.h]) diff --git a/doc/configure.ac b/doc/configure.ac index d2a60f2..d243061 100644 --- a/doc/configure.ac +++ b/doc/configure.ac @@ -9,7 +9,7 @@ # Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch> # -AC_INIT(libnl-doc, [3.2.26-rc1], [http://www.infradead.org/~tgr/libnl/]) +AC_INIT(libnl-doc, [3.2.26], [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 c609c6c..ac448c5 100644 --- a/include/netlink/utils.h +++ b/include/netlink/utils.h @@ -126,9 +126,15 @@ enum { * address timestamps and expiry when comparing struct rtnl_addr objects with * nl_object_diff(). */ - NL_CAPABILITY_ROUTE_ADDR_COMPARE_CACHEINFO = 6, + NL_CAPABILITY_ROUTE_ADDR_COMPARE_CACHEINFO = 6, #define NL_CAPABILITY_ROUTE_ADDR_COMPARE_CACHEINFO NL_CAPABILITY_ROUTE_ADDR_COMPARE_CACHEINFO + /** + * The library version is libnl3 3.2.26 or newer. This capability should never be backported. + */ + NL_CAPABILITY_VERSION_3_2_26 = 7, +#define NL_CAPABILITY_VERSION_3_2_26 NL_CAPABILITY_VERSION_3_2_26 + __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 22f5f42..68ea762 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -1150,7 +1150,7 @@ int nl_has_capability (int capability) NL_CAPABILITY_NL_CONNECT_RETRY_GENERATE_PORT_ON_ADDRINUSE, NL_CAPABILITY_ROUTE_LINK_GET_KERNEL_FAIL_OPNOTSUPP, NL_CAPABILITY_ROUTE_ADDR_COMPARE_CACHEINFO, - 0, + NL_CAPABILITY_VERSION_3_2_26, 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 |