kernel: replace bridge port isolate hack with upstream patch backport on 4.14
[openwrt/openwrt.git] / target / linux / generic / hack-4.14 / 640-bridge-only-accept-EAP-locally.patch
1 From c6905cfdeb31a5c049db3da434b10fa0d3e83569 Mon Sep 17 00:00:00 2001
2 From: Felix Fietkau <nbd@nbd.name>
3 Date: Fri, 7 Jul 2017 17:18:54 +0200
4 Subject: bridge: only accept EAP locally
5
6 When bridging, do not forward EAP frames to other ports, only deliver
7 them locally, regardless of the state.
8
9 Signed-off-by: Felix Fietkau <nbd@nbd.name>
10 ---
11 net/bridge/br_input.c | 7 +++++--
12 1 file changed, 5 insertions(+), 2 deletions(-)
13
14 --- a/net/bridge/br_input.c
15 +++ b/net/bridge/br_input.c
16 @@ -166,10 +166,14 @@ int br_handle_frame_finish(struct net *n
17 }
18 }
19
20 + BR_INPUT_SKB_CB(skb)->brdev = br->dev;
21 +
22 + if (skb->protocol == htons(ETH_P_PAE))
23 + return br_pass_frame_up(skb);
24 +
25 if (p->state == BR_STATE_LEARNING)
26 goto drop;
27
28 - BR_INPUT_SKB_CB(skb)->brdev = br->dev;
29 BR_INPUT_SKB_CB(skb)->src_port_isolated = !!(p->flags & BR_ISOLATED);
30
31 if (IS_ENABLED(CONFIG_INET) && skb->protocol == htons(ETH_P_ARP))