[PATCH v2] netfilter: remove no-op kconfig symbols

Rui Salvaterra rsalvaterra at gmail.com
Sun Apr 18 11:36:11 BST 2021


Hi, Hauke,

On Sat, 17 Apr 2021 at 17:14, Hauke Mehrtens <hauke at hauke-m.de> wrote:
>
> > -$(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK,CONFIG_NF_CONNTRACK_RTCACHE, $(P_XT)nf_conntrack_rtcache),))
>
> This is still uses with a path on top of kernel 5.4 in OpenWrt.

Not for long: https://patchwork.ozlabs.org/project/openwrt/patch/20210408225748.1596909-1-rsalvaterra@gmail.com/
And for the time being, it's a no-op.

> >   # ipv6 extra
> > diff --git a/target/linux/generic/backport-5.4/080-wireguard-0073-wireguard-selftests-import-harness-makefile-for-test.patch b/target/linux/generic/backport-5.4/080-wireguard-0073-wireguard-selftests-import-harness-makefile-for-test.patch
> > index ca3853aa19..bc3d1edeb6 100644
> > --- a/target/linux/generic/backport-5.4/080-wireguard-0073-wireguard-selftests-import-harness-makefile-for-test.patch
> > +++ b/target/linux/generic/backport-5.4/080-wireguard-0073-wireguard-selftests-import-harness-makefile-for-test.patch
> > @@ -989,7 +989,7 @@ Signed-off-by: Jason A. Donenfeld <Jason at zx2c4.com>
> >   +}
> >   --- /dev/null
> >   +++ b/tools/testing/selftests/wireguard/qemu/kernel.config
> > -@@ -0,0 +1,86 @@
> > +@@ -0,0 +1,85 @@
> >   +CONFIG_LOCALVERSION=""
> >   +CONFIG_NET=y
> >   +CONFIG_NETDEVICES=y
> > @@ -1010,7 +1010,6 @@ Signed-off-by: Jason A. Donenfeld <Jason at zx2c4.com>
> >   +CONFIG_NETFILTER_XTABLES=y
> >   +CONFIG_NETFILTER_XT_NAT=y
> >   +CONFIG_NETFILTER_XT_MATCH_LENGTH=y
> > -+CONFIG_NF_CONNTRACK_IPV4=y
>
> This is part of the original patch we backport, so it should stay here.

It's still a no-op, however. I suspect the QEMU configuration was
simply copied/adapted from an existing one. I can drop the patch
changes if they make backporting easier, of course. Jason was copied
in the v2 of the patch, I was hoping for his comment on the patch
change.

Thanks,
Rui



More information about the openwrt-devel mailing list