2011-01-25 00:25:49 +00:00
|
|
|
--- a/net/bridge/br_input.c
|
|
|
|
|
+++ b/net/bridge/br_input.c
|
|
|
|
|
@@ -77,7 +77,11 @@ int br_handle_frame_finish(struct sk_buf
|
|
|
|
|
|
|
|
|
|
dst = NULL;
|
|
|
|
|
|
|
|
|
|
- if (is_multicast_ether_addr(dest)) {
|
|
|
|
|
+ if (skb->protocol == htons(ETH_P_PAE)) {
|
|
|
|
|
+ skb2 = skb;
|
|
|
|
|
+ /* Do not forward 802.1x/EAP frames */
|
|
|
|
|
+ skb = NULL;
|
|
|
|
|
+ } else if (is_multicast_ether_addr(dest)) {
|
|
|
|
|
mdst = br_mdb_get(br, skb);
|
|
|
|
|
if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) {
|
2011-03-01 11:24:08 +00:00
|
|
|
if ((mdst && mdst->mglist) ||
|
