diff options
| -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 66585db4..e7402fdf 100644 --- a/configure.ac +++ b/configure.ac @@ -40,7 +40,7 @@ m4_define([libnl_lt_revision], [0]) m4_define([libnl_lt_age], [25]) 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 bb001739..c8bc1d49 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.3.0-rc1], [http://www.infradead.org/~tgr/libnl/]) +AC_INIT(libnl-doc, [3.3.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 c94b670d..f61ef4f4 100644 --- a/include/netlink/utils.h +++ b/include/netlink/utils.h @@ -274,6 +274,12 @@ enum { NL_CAPABILITY_XFRM_SP_SEC_CTX_LEN = 26, #define NL_CAPABILITY_XFRM_SP_SEC_CTX_LEN NL_CAPABILITY_XFRM_SP_SEC_CTX_LEN + /** + * The library version is libnl3 3.3.0 or newer. This capability should never be backported. + */ + NL_CAPABILITY_VERSION_3_3_0 = 27, +#define NL_CAPABILITY_VERSION_3_3_0 NL_CAPABILITY_VERSION_3_3_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 aaa95133..704dc7a8 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -1219,7 +1219,7 @@ int nl_has_capability (int capability) _NL_SET (3, NL_CAPABILITY_VERSION_3_2_29, NL_CAPABILITY_XFRM_SP_SEC_CTX_LEN, - 0, + NL_CAPABILITY_VERSION_3_3_0, 0, 0, 0, |