diff options
| author | Felix Fietkau <nbd@nbd.name> | 2018-07-04 20:14:08 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2018-07-11 20:59:05 +0200 |
| commit | 21ee8ce9b52f8ae4a6babf4032f71e2d4d56392b (patch) | |
| tree | 3c9ffc365878eb4483e5167c0bdf3f1e5e05f374 /target/linux/generic/hack-4.14/640-bridge-only-accept-EAP-locally.patch | |
| parent | 68f9921ed850480cf5c48aa863216f6511185aa5 (diff) | |
| download | upstream-21ee8ce9b52f8ae4a6babf4032f71e2d4d56392b.tar.gz upstream-21ee8ce9b52f8ae4a6babf4032f71e2d4d56392b.tar.bz2 upstream-21ee8ce9b52f8ae4a6babf4032f71e2d4d56392b.zip | |
kernel: replace bridge port isolate hack with upstream patch backport on 4.14
Signed-off-by: Felix Fietkau <nbd@nbd.name>
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)) |