Den sön 8 nov. 2020 kl 22:27 skrev Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx>:
>
> Hi Oskar,
>
> On Sun, 8 Nov 2020, Oskar Berggren wrote:
>
> > > > 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
> > It fixes the problems listed for jhash.h, but unfortunately not for
> > ip_set_core.c.
>
> The backward compatibility for list_for_each_entry_rcu() with three args
> only was missing indeed, the patch below should fix it:
That took care of the problems in ip_set_core.c, now I got problems
with jhash.h again. Same problem, but different compile unit, and
despite having the additional include that you suggested.
WITHOUT including the compat layer the problem occurs here:
CC [M] /home/oskar/Downloads/ipset-7.7/kernel/net/netfilter/ipset/ip_set_core.o
In file included from
/usr/src/linux-headers-4.19.0-12-common/include/net/inet_sock.h:22,
from
/usr/src/linux-headers-4.19.0-12-common/include/net/inet_connection_sock.h:24,
from
/usr/src/linux-headers-4.19.0-12-common/include/linux/tcp.h:24,
from
/usr/src/linux-headers-4.19.0-12-common/include/linux/ipv6.h:87,
from
/home/oskar/Downloads/ipset-7.7/kernel/include/linux/netfilter/ipset/ip_set.h:11,
from
/home/oskar/Downloads/ipset-7.7/kernel/net/netfilter/ipset/ip_set_core.c:23:
/home/oskar/Downloads/ipset-7.7/kernel/include/linux/jhash.h: In
function ‘jhash’:
/home/oskar/Downloads/ipset-7.7/kernel/include/linux/jhash.h:91:32:
error: ‘fallthrough’ undeclared (first use in this function)
case 12: c += (u32)k[11]<<24; fallthrough;
[...same on line 137...]
WITH the compat layer included (and the fix for
list_for_each_entry_rcu), the same error appears slightly later:
CC [M] /home/oskar/Downloads/ipset-7.7/kernel/net/netfilter/ipset/ip_set_core.o
CC [M] /home/oskar/Downloads/ipset-7.7/kernel/net/netfilter/ipset/ip_set_getport.o
CC [M] /home/oskar/Downloads/ipset-7.7/kernel/net/netfilter/ipset/pfxlen.o
In file included from
/usr/src/linux-headers-4.19.0-12-common/include/net/inet_sock.h:22,
from
/usr/src/linux-headers-4.19.0-12-common/include/net/inet_connection_sock.h:24,
from
/usr/src/linux-headers-4.19.0-12-common/include/linux/tcp.h:24,
from
/usr/src/linux-headers-4.19.0-12-common/include/net/tcp.h:24,
from
/home/oskar/Downloads/ipset-7.7/kernel/include/linux/netfilter/ipset/pfxlen.h:7,
from
/home/oskar/Downloads/ipset-7.7/kernel/net/netfilter/ipset/pfxlen.c:4:
/home/oskar/Downloads/ipset-7.7/kernel/include/linux/jhash.h: In
function ‘jhash’:
/home/oskar/Downloads/ipset-7.7/kernel/include/linux/jhash.h:91:32:
error: ‘fallthrough’ undeclared (first use in this function)
case 12: c += (u32)k[11]<<24; fallthrough;
[...same on line 137...]
/Oskar
