libnl-3.6.0 release

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 ])])
 

doc/configure.ac

@@ -3,7 +3,7 @@
 # Copyright (c) 2003-2013 Thomas Graf <[email protected]>
 #
 
-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])

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

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.