iproute2: tc: fix missing em_ipset module

[openwrt/staging/chunkeey.git] / package / network / utils / iproute2 / patches / 002-configure-support-ipset-v7.patch

diff --git a/package/network/utils/iproute2/patches/002-configure-support-ipset-v7.patch b/package/network/utils/iproute2/patches/002-configure-support-ipset-v7.patch
new file mode 100644 (file)
index 0000000..cd0c529
--- /dev/null
+++ b/package/network/utils/iproute2/patches/002-configure-support-ipset-v7.patch
@@ -0,0 +1,32 @@
+From 650591a7a70cd79d826fcdc579a20c168c987cf2 Mon Sep 17 00:00:00 2001
+From: Tony Ambardar <tony.ambardar@gmail.com>
+Date: Tue, 7 Jul 2020 00:58:33 -0700
+Subject: [PATCH] configure: support ipset version 7 with kernel version 5
+
+The configure script checks for ipset v6 availability but doesn't test
+for v7, which is backward compatible and used on kernel v5.x systems.
+Update the script to test for both ipset versions. Without this change,
+the tc ematch function em_ipset will be disabled.
+
+Signed-off-by: Tony Ambardar <Tony.Ambardar@gmail.com>
+Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index f415bf49..307912aa 100755
+--- a/configure
++++ b/configure
+@@ -208,7 +208,7 @@ typedef unsigned short ip_set_id_t;
+ #include <linux/netfilter/xt_set.h>
+ 
+ struct xt_set_info info;
+-#if IPSET_PROTOCOL == 6
++#if IPSET_PROTOCOL == 6 || IPSET_PROTOCOL == 7
+ int main(void)
+ {
+       return IPSET_MAXNAMELEN;
+-- 
+2.17.1
+