summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-07-08 09:41:40 (GMT)
committerThomas Haller <thaller@redhat.com>2016-07-08 09:41:42 (GMT)
commit656f381ccf58785319bb0236595c896125d33ed0 (patch)
tree845054d25e375a53de1535e5307e3d69480e47d2
parentbd0e87b3d81d2498c3f35d5497771828bf04e017 (diff)
downloadlibnl-656f381ccf58785319bb0236595c896125d33ed0.zip
libnl-656f381ccf58785319bb0236595c896125d33ed0.tar.gz
libnl-656f381ccf58785319bb0236595c896125d33ed0.tar.bz2
libnl-3.2.28 releaselibnl3_2_28
Signed-off-by: Thomas Haller <thaller@redhat.com>
-rw-r--r--configure.ac2
-rw-r--r--doc/configure.ac2
-rw-r--r--include/netlink/utils.h6
-rw-r--r--lib/utils.c2
4 files changed, 9 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index b90d438..bcc0a9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ m4_define([libnl_lt_revision], [0])
m4_define([libnl_lt_age], [23])
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 de62438..8a8badb 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.28-rc1], [http://www.infradead.org/~tgr/libnl/])
+AC_INIT(libnl-doc, [3.2.28], [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 73e978a..3b10340 100644
--- a/include/netlink/utils.h
+++ b/include/netlink/utils.h
@@ -211,6 +211,12 @@ enum {
NL_CAPABILITY_RTNL_ADDR_PEER_FIX = 18,
#define NL_CAPABILITY_RTNL_ADDR_PEER_FIX NL_CAPABILITY_RTNL_ADDR_PEER_FIX
+ /**
+ * The library version is libnl3 3.2.28 or newer. This capability should never be backported.
+ */
+ NL_CAPABILITY_VERSION_3_2_28 = 19,
+#define NL_CAPABILITY_VERSION_3_2_28 NL_CAPABILITY_VERSION_3_2_28
+
__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 ecaed5c..3399c03 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -1163,7 +1163,7 @@ int nl_has_capability (int capability)
_NL_SET (2,
NL_CAPABILITY_XFRM_SA_KEY_SIZE,
NL_CAPABILITY_RTNL_ADDR_PEER_FIX,
- 0,
+ NL_CAPABILITY_VERSION_3_2_28,
0,
0,
0,