projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: backport upstream bridge multicast snooping fixes
[openwrt.git]
/
target
/
linux
/
generic
/
patches-3.10
/
120-bridge_allow_receiption_on_disabled_port.patch
diff --git
a/target/linux/generic/patches-3.10/120-bridge_allow_receiption_on_disabled_port.patch
b/target/linux/generic/patches-3.10/120-bridge_allow_receiption_on_disabled_port.patch
index
f64db0f
..
7fe4bfd
100644
(file)
--- a/
target/linux/generic/patches-3.10/120-bridge_allow_receiption_on_disabled_port.patch
+++ b/
target/linux/generic/patches-3.10/120-bridge_allow_receiption_on_disabled_port.patch
@@
-15,7
+15,7
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
-@@ -1
39,10 +139
,14 @@ drop:
+@@ -1
40,10 +140
,14 @@ drop:
static int br_handle_local_finish(struct sk_buff *skb)
{
struct net_bridge_port *p = br_port_get_rcu(skb->dev);
static int br_handle_local_finish(struct sk_buff *skb)
{
struct net_bridge_port *p = br_port_get_rcu(skb->dev);
@@
-33,7
+33,7
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
return 0; /* process further */
}
return 0; /* process further */
}
-@@ -21
2,6 +216
,18 @@ rx_handler_result_t br_handle_frame(stru
+@@ -21
3,6 +217
,18 @@ rx_handler_result_t br_handle_frame(stru
forward:
switch (p->state) {
forward:
switch (p->state) {