diff --git a/configure.ac b/configure.ac index 89bc18a20..dfead9818 100644 --- a/configure.ac +++ b/configure.ac @@ -40,7 +40,7 @@ m4_define([libnl_lt_revision], [0]) m4_define([libnl_lt_age], [26]) 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 539963a41..4539c9b20 100644 --- a/doc/configure.ac +++ b/doc/configure.ac @@ -9,7 +9,7 @@ # Copyright (c) 2003-2013 Thomas Graf # -AC_INIT(libnl-doc, [3.4.0-rc1], [http://www.infradead.org/~tgr/libnl/]) +AC_INIT(libnl-doc, [3.4.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 f61ef4f42..10e76ce4e 100644 --- a/include/netlink/utils.h +++ b/include/netlink/utils.h @@ -280,6 +280,12 @@ enum { NL_CAPABILITY_VERSION_3_3_0 = 27, #define NL_CAPABILITY_VERSION_3_3_0 NL_CAPABILITY_VERSION_3_3_0 + /** + * The library version is libnl3 3.4.0 or newer. This capability should never be backported. + */ + NL_CAPABILITY_VERSION_3_4_0 = 28, +#define NL_CAPABILITY_VERSION_3_4_0 NL_CAPABILITY_VERSION_3_4_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 704dc7a85..544feda03 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -1220,7 +1220,7 @@ int nl_has_capability (int capability) NL_CAPABILITY_VERSION_3_2_29, NL_CAPABILITY_XFRM_SP_SEC_CTX_LEN, NL_CAPABILITY_VERSION_3_3_0, - 0, + NL_CAPABILITY_VERSION_3_4_0, 0, 0, 0,