diff mbox series

[iproute2] configure: support ipset version 7 with kernel version 5

Message ID 20200707075833.1698-1-Tony.Ambardar@gmail.com
State Accepted
Delegated to: stephen hemminger
Headers show
Series [iproute2] configure: support ipset version 7 with kernel version 5 | expand

Commit Message

Tony Ambardar July 7, 2020, 7:58 a.m. UTC
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>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Stephen Hemminger July 8, 2020, 3:49 p.m. UTC | #1
On Tue,  7 Jul 2020 00:58:33 -0700
Tony Ambardar <tony.ambardar@gmail.com> wrote:

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

Sure applied. Maybe it should just check for > 6 to be future proof.
Tony Ambardar July 9, 2020, 2:56 a.m. UTC | #2
On Wed, 8 Jul 2020 at 08:49, Stephen Hemminger
<stephen@networkplumber.org> wrote:
>
> On Tue,  7 Jul 2020 00:58:33 -0700
> Tony Ambardar <tony.ambardar@gmail.com> wrote:
>
> > 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>
>
> Sure applied. Maybe it should just check for > 6 to be future proof.

Thank you. I kept the test as is since I couldn't confirm ipset
backward compatibility in
the future. If you have more insight, please let me know and I'll update it.
diff mbox series

Patch

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;