This fixes multiple compile problems seen with kernel 4.14. 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); + ct = nf_ct_get(skb, &ctinfo); diff --git a/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch b/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch index 7599684bdb..a9fb796d09 100644 --- a/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch +++ b/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch @@ -1,5 +1,14 @@ --- a/extensions/LUA/xt_LUA_target.c +++ b/extensions/LUA/xt_LUA_target.c +@@ -19,7 +19,7 @@ + #include <linux/kernel.h> + #include <linux/slab.h> + #include <linux/module.h> +-#include <asm/uaccess.h> ++#include <linux/uaccess.h> + #include <net/ip.h> + #include <linux/netfilter/x_tables.h> + #include "xt_LUA.h" @@ -64,10 +64,10 @@ uint32_t lua_state_refs[LUA_STATE_ARRAY * XT_CONTINUE inside the *register_lua_packet_lib* function. */ -- 2.11.0 _______________________________________________ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
