diff options
| author | Felix Fietkau <nbd@nbd.name> | 2018-07-04 20:14:08 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-12-18 09:45:59 +0100 |
| commit | e68e498ff35412daba861c9d6d8ebad8f22a6465 (patch) | |
| tree | a86330a561d19cb4348e283ee91793fb315457a3 /target/linux/generic/hack-4.14/640-bridge-only-accept-EAP-locally.patch | |
| parent | b06665b2052eac06cb5a2359e1d569cbeca72e91 (diff) | |
| download | upstream-e68e498ff35412daba861c9d6d8ebad8f22a6465.tar.gz upstream-e68e498ff35412daba861c9d6d8ebad8f22a6465.tar.bz2 upstream-e68e498ff35412daba861c9d6d8ebad8f22a6465.zip | |
kernel: replace bridge port isolate hack with upstream patch backport on 4.14
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(backported from 21ee8ce9b52f8ae4a6babf4032f71e2d4d56392b)
(rebased patches)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'target/linux/generic/hack-4.14/640-bridge-only-accept-EAP-locally.patch')
| -rw-r--r-- | target/linux/generic/hack-4.14/640-bridge-only-accept-EAP-locally.patch | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/target/linux/generic/hack-4.14/640-bridge-only-accept-EAP-locally.patch b/target/linux/generic/hack-4.14/640-bridge-only-accept-EAP-locally.patch index 83c9cf739f..0dbb8ee3c0 100644 --- a/target/linux/generic/hack-4.14/640-bridge-only-accept-EAP-locally.patch +++ b/target/linux/generic/hack-4.14/640-bridge-only-accept-EAP-locally.patch @@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c -@@ -166,11 +166,14 @@ int br_handle_frame_finish(struct net *n +@@ -166,10 +166,14 @@ int br_handle_frame_finish(struct net *n } } @@ -26,7 +26,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> goto drop; - BR_INPUT_SKB_CB(skb)->brdev = br->dev; -- - if (IS_ENABLED(CONFIG_INET) && skb->protocol == htons(ETH_P_ARP)) - br_do_proxy_arp(skb, br, vid, p); + BR_INPUT_SKB_CB(skb)->src_port_isolated = !!(p->flags & BR_ISOLATED); + if (IS_ENABLED(CONFIG_INET) && skb->protocol == htons(ETH_P_ARP)) |