diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2014-10-27 18:14:39 +0000 |
---|---|---|
committer | Rafał Miłecki <zajec5@gmail.com> | 2014-10-27 18:14:39 +0000 |
commit | 1513b39a8c8e21e3f8fbebab9fb4c41040ccf695 (patch) | |
tree | 7c786effff410b4a96d29c920d60cd279236fbf7 /target/linux/generic/patches-3.18/120-bridge_allow_receiption_on_disabled_port.patch | |
parent | 38e72c779e229933625d96d4355a0250123b6ce5 (diff) | |
download | upstream-1513b39a8c8e21e3f8fbebab9fb4c41040ccf695.tar.gz upstream-1513b39a8c8e21e3f8fbebab9fb4c41040ccf695.tar.bz2 upstream-1513b39a8c8e21e3f8fbebab9fb4c41040ccf695.zip |
kernel: start working on 3.18 support
This commit:
1) Copies 3.14 patches
2) Drops mainlined stuff
3) Modifies some patches to apply
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 43093
Diffstat (limited to 'target/linux/generic/patches-3.18/120-bridge_allow_receiption_on_disabled_port.patch')
-rw-r--r-- | target/linux/generic/patches-3.18/120-bridge_allow_receiption_on_disabled_port.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.18/120-bridge_allow_receiption_on_disabled_port.patch b/target/linux/generic/patches-3.18/120-bridge_allow_receiption_on_disabled_port.patch new file mode 100644 index 0000000000..d80ef18dd3 --- /dev/null +++ b/target/linux/generic/patches-3.18/120-bridge_allow_receiption_on_disabled_port.patch @@ -0,0 +1,54 @@ +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 +@@ -146,11 +146,13 @@ EXPORT_SYMBOL_GPL(br_handle_frame_finish + 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; + +- /* check if vlan is allowed, to avoid spoofing */ +- if (p->flags & BR_LEARNING && br_should_learn(p, skb, &vid)) +- br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid, false); ++ /* check if vlan is allowed, to avoid spoofing */ ++ if (p->flags & BR_LEARNING && br_should_learn(p, skb, &vid)) ++ br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid, false); ++ } + return 0; /* process further */ + } + +@@ -224,6 +226,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) { |