From: Tony Ambardar <tony.ambardar@gmail.com>
Date: Tue, 7 Jul 2020 07:58:33 +0000 (-0700)
Subject: configure: support ipset version 7 with kernel version 5
X-Git-Tag: v5.8.0~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=650591a7a70cd79d826fcdc579a20c168c987cf2;p=thirdparty%2Fiproute2.git

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

diff --git a/configure b/configure
index f415bf497..307912aa9 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;