mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-13 18:34:53 +00:00
74d00a8c38
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
38 lines
1.0 KiB
Diff
38 lines
1.0 KiB
Diff
From c6905cfdeb31a5c049db3da434b10fa0d3e83569 Mon Sep 17 00:00:00 2001
|
|
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Fri, 7 Jul 2017 17:18:54 +0200
|
|
Subject: bridge: only accept EAP locally
|
|
|
|
When bridging, do not forward EAP frames to other ports, only deliver
|
|
them locally, regardless of the state.
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
net/bridge/br_input.c | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
|
|
index 267b46af407f..48fa08f32c2a 100644
|
|
--- a/net/bridge/br_input.c
|
|
+++ b/net/bridge/br_input.c
|
|
@@ -164,11 +164,14 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
|
|
}
|
|
}
|
|
|
|
+ BR_INPUT_SKB_CB(skb)->brdev = br->dev;
|
|
+
|
|
+ if (skb->protocol == htons(ETH_P_PAE))
|
|
+ return br_pass_frame_up(skb);
|
|
+
|
|
if (p->state == BR_STATE_LEARNING)
|
|
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);
|
|
|
|
--
|
|
2.11.0
|
|
|