On 11/26/2017 06:36 PM, Arjen de Korte wrote: > Citeren Hauke Mehrtens <ha...@hauke-m.de>: > >> This fixes multiple compile problems seen with kernel 4.14. > > Comments inline. > >> Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de> >> --- >> .../utils/xtables-addons/patches/001-fix-compile.patch | 11 >> +++++++++++ >> .../xtables-addons/patches/201-fix-lua-packetscript.patch | 9 >> +++++++++ >> 2 files changed, 20 insertions(+) >> create mode 100644 >> package/network/utils/xtables-addons/patches/001-fix-compile.patch >> >> diff --git >> a/package/network/utils/xtables-addons/patches/001-fix-compile.patch >> b/package/network/utils/xtables-addons/patches/001-fix-compile.patch >> new file mode 100644 >> index 0000000000..e428a75cb1 >> --- /dev/null >> +++ b/package/network/utils/xtables-addons/patches/001-fix-compile.patch >> @@ -0,0 +1,11 @@ >> +--- a/extensions/xt_DNETMAP.c >> ++++ b/extensions/xt_DNETMAP.c >> +@@ -377,7 +377,7 @@ dnetmap_tg(struct sk_buff *skb, const st >> + unsigned int hooknum = par->hooknum; >> + #endif >> + >> +- NF_CT_ASSERT(hooknum == NF_INET_POST_ROUTING || >> ++ WARN_ON(hooknum == NF_INET_POST_ROUTING || >> + hooknum == NF_INET_LOCAL_OUT || >> + hooknum == NF_INET_PRE_ROUTING); > > You reversed the logic here. NF_CT_ASSERT(x) is equivalent to > WARN_ON(!(x)). See the commit log message that removed this macro from > the kernel: > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/include/net/netfilter/nf_conntrack.h?id=9efdb14f76f4d7591cd4d7a436ebd716b19703b6
You are right, I will fix this. I just saw that in the upstream version this was just removed: https://sourceforge.net/p/xtables-addons/xtables-addons/ci/0a6091b64afc3d67c8a9194b8f6230122384f6d9/ I will probably just update to xtables-addons 2.14 and remove this part. Hauke _______________________________________________ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
