aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.12/120-bridge_allow_receiption_on_disabled_port.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-07-10 22:37:28 +0000
committerLuka Perkov <luka@openwrt.org>2014-07-10 22:37:28 +0000
commit508f1c2dbc7d1204dcdc9a4628c3687eea9ff542 (patch)
treea319d92c63bf87f37b5689b0caa9c229975382e4 /target/linux/generic/patches-3.12/120-bridge_allow_receiption_on_disabled_port.patch
parent8596ba6e34c1027aebf737f4e215ae56b03dbe8a (diff)
downloadupstream-508f1c2dbc7d1204dcdc9a4628c3687eea9ff542.tar.gz
upstream-508f1c2dbc7d1204dcdc9a4628c3687eea9ff542.tar.bz2
upstream-508f1c2dbc7d1204dcdc9a4628c3687eea9ff542.zip
kernel: remove 3.12 support since none of the targets is using it
Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41581 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.12/120-bridge_allow_receiption_on_disabled_port.patch')
-rw-r--r--target/linux/generic/patches-3.12/120-bridge_allow_receiption_on_disabled_port.patch54
1 files changed, 0 insertions, 54 deletions
diff --git a/target/linux/generic/patches-3.12/120-bridge_allow_receiption_on_disabled_port.patch b/target/linux/generic/patches-3.12/120-bridge_allow_receiption_on_disabled_port.patch
deleted file mode 100644
index 8a2fb41d65..0000000000
--- a/target/linux/generic/patches-3.12/120-bridge_allow_receiption_on_disabled_port.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Stephen Hemminger <stephen@networkplumber.org>
-Subject: bridge: allow receiption on disabled port
-
-When an ethernet device is enslaved to a bridge, and the bridge STP
-detects loss of carrier (or operational state down), then normally
-packet receiption is blocked.
-
-This breaks control applications like WPA which maybe expecting to
-receive packets to negotiate to bring link up. The bridge needs to
-block forwarding packets from these disabled ports, but there is no
-hard requirement to not allow local packet delivery.
-
-Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-
---- a/net/bridge/br_input.c
-+++ b/net/bridge/br_input.c
-@@ -144,11 +144,13 @@ drop:
- static int br_handle_local_finish(struct sk_buff *skb)
- {
- struct net_bridge_port *p = br_port_get_rcu(skb->dev);
-- u16 vid = 0;
-+ if (p->state != BR_STATE_DISABLED) {
-+ u16 vid = 0;
-
-- br_vlan_get_tag(skb, &vid);
-- if (p->flags & BR_LEARNING)
-- br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid);
-+ br_vlan_get_tag(skb, &vid);
-+ if (p->flags & BR_LEARNING)
-+ br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid);
-+ }
- return 0; /* process further */
- }
-
-@@ -218,6 +220,18 @@ rx_handler_result_t br_handle_frame(stru
-
- forward:
- switch (p->state) {
-+ case BR_STATE_DISABLED:
-+ if (ether_addr_equal(p->br->dev->dev_addr, dest))
-+ skb->pkt_type = PACKET_HOST;
-+
-+ if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
-+ br_handle_local_finish))
-+ break;
-+
-+ BR_INPUT_SKB_CB(skb)->brdev = p->br->dev;
-+ br_pass_frame_up(skb);
-+ break;
-+
- case BR_STATE_FORWARDING:
- rhook = rcu_dereference(br_should_route_hook);
- if (rhook) {