diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-09-08 19:55:36 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-09-08 19:55:36 +0000 |
commit | 54cd991725079fdce550e86f2303ece870203386 (patch) | |
tree | ef26822511b5dfe4eba238e4a9f0665bc99201e7 /target/linux/generic/patches-3.9/120-bridge_allow_receiption_on_disabled_port.patch | |
parent | eea3a89a6a158dda4751802d952ddc07408c1b0a (diff) | |
download | upstream-54cd991725079fdce550e86f2303ece870203386.tar.gz upstream-54cd991725079fdce550e86f2303ece870203386.tar.bz2 upstream-54cd991725079fdce550e86f2303ece870203386.zip |
kernel: drop 3.9 support
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 42452
Diffstat (limited to 'target/linux/generic/patches-3.9/120-bridge_allow_receiption_on_disabled_port.patch')
-rw-r--r-- | target/linux/generic/patches-3.9/120-bridge_allow_receiption_on_disabled_port.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/target/linux/generic/patches-3.9/120-bridge_allow_receiption_on_disabled_port.patch b/target/linux/generic/patches-3.9/120-bridge_allow_receiption_on_disabled_port.patch deleted file mode 100644 index f64db0fa3c..0000000000 --- a/target/linux/generic/patches-3.9/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 -@@ -139,10 +139,14 @@ 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; - -- br_vlan_get_tag(skb, &vid); -- br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid); -+ if (p->state != BR_STATE_DISABLED) { -+ u16 vid = 0; -+ -+ br_vlan_get_tag(skb, &vid); -+ br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid); -+ } -+ - return 0; /* process further */ - } - -@@ -212,6 +216,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) { |