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

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 83c9cf739fd14f34eae765c44a993d626e8409af..0dbb8ee3c0a43fdccb7a78c85e61ef03eda9af1b 100644 (file)
--- 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))