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 | 36a95b7f874b6e2f7dc3080341d0ba704302b103 (patch) | |
| tree | 7ee0b3d81bc8df359faff61c3a49ddcaae8b58de /target/linux/generic/patches-3.10/120-bridge_allow_receiption_on_disabled_port.patch | |
| parent | 1f81f496a7fb4b86cc0eb04d534c27f1484efa80 (diff) | |
| download | master-187ad058-36a95b7f874b6e2f7dc3080341d0ba704302b103.tar.gz master-187ad058-36a95b7f874b6e2f7dc3080341d0ba704302b103.tar.bz2 master-187ad058-36a95b7f874b6e2f7dc3080341d0ba704302b103.zip | |
kernel: backport upstream bridge multicast snooping fixes
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41817 3c298f89-4303-0410-b956-a3cf2f4a3e73
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) { |