kernel: merge the eap frame drop fix for the bridging code from r25095
[openwrt-10.03/.git] / target / linux / generic-2.6 / patches-2.6.30 / 280-bridge_no_eap_forward.patch
1 --- a/net/bridge/br_input.c
2 +++ b/net/bridge/br_input.c
3 @@ -61,7 +61,11 @@ int br_handle_frame_finish(struct sk_buf
4  
5         dst = NULL;
6  
7 -       if (is_multicast_ether_addr(dest)) {
8 +       if (skb->protocol == htons(ETH_P_PAE)) {
9 +               skb2 = skb;
10 +               /* Do not forward 802.1x/EAP frames */
11 +               skb = NULL;
12 +       } else if (is_multicast_ether_addr(dest)) {
13                 br->dev->stats.multicast++;
14                 skb2 = skb;
15         } else if ((dst = __br_fdb_get(br, dest)) && dst->is_local) {