utils: reserve the nl_has_capabiliy numbers for releases 3.10 - 3.12

Fix the capability numbers for the next few releases already. While not yet in use, the number is reserved and stable.
thom311 · May 7, 2024 · 7cc72d1 · 7cc72d1
1 parent 30da510
commit 7cc72d1
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/include/netlink/utils.h b/include/netlink/utils.h
@@ -331,6 +331,24 @@ enum {
 	NL_CAPABILITY_VERSION_3_9_0 = 35,
 #define NL_CAPABILITY_VERSION_3_9_0 NL_CAPABILITY_VERSION_3_9_0
 
+	/**
+	 * The library version is libnl3 3.10.0 or newer. This capability should never be backported.
+	 */
+	NL_CAPABILITY_VERSION_3_10_0 = 36,
+#define NL_CAPABILITY_VERSION_3_10_0 NL_CAPABILITY_VERSION_3_10_0
+
+	/**
+	 * The library version is libnl3 3.11.0 or newer. This capability should never be backported.
+	 */
+	NL_CAPABILITY_VERSION_3_11_0 = 37,
+#define NL_CAPABILITY_VERSION_3_11_0 NL_CAPABILITY_VERSION_3_11_0
+
+	/**
+	 * The library version is libnl3 3.12.0 or newer. This capability should never be backported.
+	 */
+	NL_CAPABILITY_VERSION_3_12_0 = 38,
+#define NL_CAPABILITY_VERSION_3_12_0 NL_CAPABILITY_VERSION_3_12_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
@@ -1283,9 +1283,9 @@ int nl_has_capability (int capability)
 			NL_CAPABILITY_VERSION_3_7_0,
 			NL_CAPABILITY_VERSION_3_8_0,
 			NL_CAPABILITY_VERSION_3_9_0,
-			0,
-			0,
-			0,
+			0, /* NL_CAPABILITY_VERSION_3_10_0 */
+			0, /* NL_CAPABILITY_VERSION_3_11_0 */
+			0, /* NL_CAPABILITY_VERSION_3_12_0 */
 			0,
 			0),
 		/* IMPORTANT: these capability numbers are intended to be universal and stable