]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
configure: support ipset version 7 with kernel version 5
authorTony Ambardar <tony.ambardar@gmail.com>
Tue, 7 Jul 2020 07:58:33 +0000 (00:58 -0700)
committerStephen Hemminger <stephen@networkplumber.org>
Wed, 8 Jul 2020 15:48:02 +0000 (08:48 -0700)
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

index f415bf4975e710bd1386b68f46a93adc2ff273f2..307912aa9185f893d80cd7097e662f759cc125ba 100755 (executable)
--- 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;