75744d133d
It was corrupted in r38528. The most obvious symptom is repeated messages like this: Tue Sep 8 08:25:18 2015 kern.warn kernel: [77141.972226] br-lan: received packet on wlan0 with own address as source address Signed-off-by: Dmitry Ivanov <dima@ubnt.com> SVN-Revision: 46821
15 lines
506 B
Diff
15 lines
506 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 */
|
|
+ skb = NULL;
|
|
+ } else if (is_broadcast_ether_addr(dest)) {
|
|
skb2 = skb;
|
|
unicast = false;
|
|
} else if (is_multicast_ether_addr(dest)) {
|