aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.15/150-bridge_allow_receiption_on_disabled_port.patch
diff options
context:
space:
mode:
authorAnsuel Smith <ansuelsmth@gmail.com>2022-03-21 15:22:20 +0100
committerDaniel Golle <daniel@makrotopia.org>2022-03-27 05:00:50 +0100
commit009f8afe06258adff30d83e936d097e42d5501ca (patch)
tree8d8059364dd135646aae277ace45e77674c19865 /target/linux/generic/pending-5.15/150-bridge_allow_receiption_on_disabled_port.patch
parent49cb5e501a8d6eb8ff5cad63f13282de7b84e7ef (diff)
downloadupstream-009f8afe06258adff30d83e936d097e42d5501ca.tar.gz
upstream-009f8afe06258adff30d83e936d097e42d5501ca.tar.bz2
upstream-009f8afe06258adff30d83e936d097e42d5501ca.zip
generic: 5.15: refresh pending patch
Use 'make target/linux/refresh' to refresh pending patches. Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-5.15/150-bridge_allow_receiption_on_disabled_port.patch')
-rw-r--r--target/linux/generic/pending-5.15/150-bridge_allow_receiption_on_disabled_port.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.15/150-bridge_allow_receiption_on_disabled_port.patch b/target/linux/generic/pending-5.15/150-bridge_allow_receiption_on_disabled_port.patch
index 6de22b1c7d..2b9570e9a0 100644
--- a/target/linux/generic/pending-5.15/150-bridge_allow_receiption_on_disabled_port.patch
+++ b/target/linux/generic/pending-5.15/150-bridge_allow_receiption_on_disabled_port.patch
@@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
-@@ -195,6 +195,9 @@ static void __br_handle_local_finish(str
+@@ -197,6 +197,9 @@ static void __br_handle_local_finish(str
/* note: already called with rcu_read_lock */
static int br_handle_local_finish(struct net *net, struct sock *sk, struct sk_buff *skb)
{
@@ -25,7 +25,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
__br_handle_local_finish(skb);
/* return 1 to signal the okfn() was called so it's ok to use the skb */
-@@ -348,6 +351,17 @@ static rx_handler_result_t br_handle_fra
+@@ -362,6 +365,17 @@ static rx_handler_result_t br_handle_fra
forward:
switch (p->state) {