Re: ipset 7.7 modules fail to build on kernel 4.19.152

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

On Sun, 1 Nov 2020, Oskar Berggren wrote:

> I can build ipset 7.6 modules on 4.19.152 kernel (Debian buster
> current stable), but 7.7 fails:
> 
> $ configure; make
> $ make modules
> jhash.h:90:32 `fallthrough` undeclared
> jhash.h:136:21 `fallthrough` undeclared
> 
> ip_set_core.c:90:40 macro list_for_each_entry_rcu passed 4 arguments
> but takes just 3
> ip_set_core.c:89:2 list_for_each_entry_rcu undeclared
> 
> Plus a few more but I think they are just because the compiler is
> confused after the above problems.
> 
> There are commits in 7.7 touching the above pieces of code.

Does the patch fixes all the issues above?

diff --git a/kernel/include/linux/jhash.h b/kernel/include/linux/jhash.h
index 5e578b1..8df77ec 100644
--- a/kernel/include/linux/jhash.h
+++ b/kernel/include/linux/jhash.h
@@ -1,5 +1,6 @@
 #ifndef _LINUX_JHASH_H
 #define _LINUX_JHASH_H
+#include <linux/netfilter/ipset/ip_set_compat.h>
 
 /* jhash.h: Jenkins hash support.
  *
 
> Btw, and unrelated to above, recent kernels (4.19.134+) remove 
> tc_skb_protocol [0] but seems to provide vlan aware skb_protocol [1] 
> instead. Perhaps ipset should use that when available, instead of its 
> own tc_skb_protocol fallback?
> 
> 
> [0] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v4.19.134&id=9fd235ff00008e093951b4801349436fa27c64e8
> [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v4.19.134&id=d4d0e6c07bcd17d704afe64e10382ffc5d342765

I'll look into it, thanks!

Best regards,
Jozsef
-
E-mail  : kadlec@xxxxxxxxxxxxxxxxx, kadlecsik.jozsef@xxxxxxxxx
PGP key : https://wigner.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics
          H-1525 Budapest 114, POB. 49, Hungary



[Index of Archives]     [Netfitler Users]     [Berkeley Packet Filter]     [LARTC]     [Bugtraq]     [Yosemite Forum]

  Powered by Linux