mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-01-23 07:01:06 +02:00
kernel: merge the eap frame drop fix for the bridging code from r25095
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@25364 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
6274c8102e
commit
cf371e4800
@ -0,0 +1,15 @@
|
||||
--- a/net/bridge/br_input.c
|
||||
+++ b/net/bridge/br_input.c
|
||||
@@ -61,7 +61,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)) {
|
||||
br->dev->stats.multicast++;
|
||||
skb2 = skb;
|
||||
} else if ((dst = __br_fdb_get(br, dest)) && dst->is_local) {
|
@ -0,0 +1,15 @@
|
||||
--- a/net/bridge/br_input.c
|
||||
+++ b/net/bridge/br_input.c
|
||||
@@ -61,7 +61,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)) {
|
||||
br->dev->stats.multicast++;
|
||||
skb2 = skb;
|
||||
} else if ((dst = __br_fdb_get(br, dest)) && dst->is_local) {
|
Loading…
x
Reference in New Issue
Block a user