a0c49ef46f
Boot tested: http://pastebin.com/L6aAb9xj Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> [jogo: update to 4.1 final add patches added since submission delete patches applied in later rcs restore commit messages in 220-gc-sections and 304-mips_disable_fpu fix 050-backport_netfilter_rtcache to match new API update inlined dma ops with upstream changes add missing config symbols enabled CONFIG_MULTIUSER update kmod defintions for 4.1 ] Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46112
15 lines
493 B
Diff
15 lines
493 B
Diff
--- a/net/bridge/br_input.c
|
|
+++ b/net/bridge/br_input.c
|
|
@@ -162,7 +162,11 @@ int br_handle_frame_finish(struct sock *
|
|
if (IS_ENABLED(CONFIG_INET) && skb->protocol == htons(ETH_P_ARP))
|
|
br_do_proxy_arp(skb, br, vid, p);
|
|
|
|
- if (is_broadcast_ether_addr(dest)) {
|
|
+ if (skb->protocol == htons(ETH_P_PAE)) {
|
|
+ skb2 = skb;
|
|
+ /* Do not forward 802.1x/EAP frames */
|
|
+
|
|
+ } else if (is_broadcast_ether_addr(dest)) {
|
|
skb2 = skb;
|
|
unicast = false;
|
|
} else if (is_multicast_ether_addr(dest)) {
|