diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-07-24 09:12:59 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-07-24 09:12:59 +0000 |
commit | dd7650f67cdbdec6bc8ada714eeeb366eb70a62f (patch) | |
tree | fc2973693b7e62b45b8e3015d41c1217c361d390 /target/linux/generic/patches-3.10/120-bridge_allow_receiption_on_disabled_port.patch | |
parent | 22419ae4cb52baccbfea40a0f461565c027350b8 (diff) | |
download | master-31e0f0ae-dd7650f67cdbdec6bc8ada714eeeb366eb70a62f.tar.gz master-31e0f0ae-dd7650f67cdbdec6bc8ada714eeeb366eb70a62f.tar.bz2 master-31e0f0ae-dd7650f67cdbdec6bc8ada714eeeb366eb70a62f.zip |
kernel: backport upstream bridge multicast snooping fixes
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 41817
Diffstat (limited to 'target/linux/generic/patches-3.10/120-bridge_allow_receiption_on_disabled_port.patch')
-rw-r--r-- | target/linux/generic/patches-3.10/120-bridge_allow_receiption_on_disabled_port.patch | 4 |
1 files changed, 2 insertions, 2 deletions
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 f64db0fa3c..7fe4bfd429 100644 --- 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 -@@ -139,10 +139,14 @@ drop: +@@ -140,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); @@ -33,7 +33,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> return 0; /* process further */ } -@@ -212,6 +216,18 @@ rx_handler_result_t br_handle_frame(stru +@@ -213,6 +217,18 @@ rx_handler_result_t br_handle_frame(stru forward: switch (p->state) { |