projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: add support for kernel 5.4
[openwrt/openwrt.git]
/
target
/
linux
/
generic
/
pending-5.4
/
611-netfilter_match_bypass_default_table.patch
diff --git
a/target/linux/generic/pending-5.4/611-netfilter_match_bypass_default_table.patch
b/target/linux/generic/pending-5.4/611-netfilter_match_bypass_default_table.patch
index ba976b0751c88fe22f87899b3b62e00bb9f30acf..baf738a8d20898b8a0080c08fed0b8d17dc89069 100644
(file)
--- a/
target/linux/generic/pending-5.4/611-netfilter_match_bypass_default_table.patch
+++ b/
target/linux/generic/pending-5.4/611-netfilter_match_bypass_default_table.patch
@@
-8,7
+8,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
-@@ -24
9,6 +249
,33 @@ struct ipt_entry *ipt_next_entry(const s
+@@ -24
6,6 +246
,33 @@ struct ipt_entry *ipt_next_entry(const s
return (void *)entry + entry->next_offset;
}
return (void *)entry + entry->next_offset;
}
@@
-42,7
+42,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* Returns one of the generic firewall policies, like NF_ACCEPT. */
unsigned int
ipt_do_table(struct sk_buff *skb,
/* Returns one of the generic firewall policies, like NF_ACCEPT. */
unsigned int
ipt_do_table(struct sk_buff *skb,
-@@ -26
9,27 +296
,28 @@ ipt_do_table(struct sk_buff *skb,
+@@ -26
6,27 +293
,28 @@ ipt_do_table(struct sk_buff *skb,
unsigned int addend;
/* Initialization */
unsigned int addend;
/* Initialization */
@@
-86,7
+86,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
jumpstack = (struct ipt_entry **)private->jumpstack[cpu];
/* Switch to alternate jumpstack if we're being invoked via TEE.
jumpstack = (struct ipt_entry **)private->jumpstack[cpu];
/* Switch to alternate jumpstack if we're being invoked via TEE.
-@@ -
302,7 +330
,16 @@ ipt_do_table(struct sk_buff *skb,
+@@ -
299,7 +327
,16 @@ ipt_do_table(struct sk_buff *skb,
if (static_key_false(&xt_tee_enabled))
jumpstack += private->stacksize * __this_cpu_read(nf_skb_duplicated);
if (static_key_false(&xt_tee_enabled))
jumpstack += private->stacksize * __this_cpu_read(nf_skb_duplicated);