kernel: allow EAP frames to pass through bridges even in learning state - fixes issues with WDS
SVN-Revision: 26015
This commit is contained in:
		@@ -0,0 +1,11 @@
 | 
			
		||||
--- a/net/bridge/br_input.c
 | 
			
		||||
+++ b/net/bridge/br_input.c
 | 
			
		||||
@@ -50,7 +50,7 @@ int br_handle_frame_finish(struct sk_buf
 | 
			
		||||
 	br = p->br;
 | 
			
		||||
 	br_fdb_update(br, p, eth_hdr(skb)->h_source);
 | 
			
		||||
 
 | 
			
		||||
-	if (p->state == BR_STATE_LEARNING)
 | 
			
		||||
+	if ((p->state == BR_STATE_LEARNING) && skb->protocol != htons(ETH_P_PAE))
 | 
			
		||||
 		goto drop;
 | 
			
		||||
 
 | 
			
		||||
 	/* The packet skb2 goes to the local host (NULL to skip). */
 | 
			
		||||
@@ -0,0 +1,11 @@
 | 
			
		||||
--- a/net/bridge/br_input.c
 | 
			
		||||
+++ b/net/bridge/br_input.c
 | 
			
		||||
@@ -50,7 +50,7 @@ int br_handle_frame_finish(struct sk_buf
 | 
			
		||||
 	br = p->br;
 | 
			
		||||
 	br_fdb_update(br, p, eth_hdr(skb)->h_source);
 | 
			
		||||
 
 | 
			
		||||
-	if (p->state == BR_STATE_LEARNING)
 | 
			
		||||
+	if ((p->state == BR_STATE_LEARNING) && skb->protocol != htons(ETH_P_PAE))
 | 
			
		||||
 		goto drop;
 | 
			
		||||
 
 | 
			
		||||
 	/* The packet skb2 goes to the local host (NULL to skip). */
 | 
			
		||||
@@ -0,0 +1,11 @@
 | 
			
		||||
--- a/net/bridge/br_input.c
 | 
			
		||||
+++ b/net/bridge/br_input.c
 | 
			
		||||
@@ -56,7 +56,7 @@ int br_handle_frame_finish(struct sk_buf
 | 
			
		||||
 	    br_multicast_rcv(br, p, skb))
 | 
			
		||||
 		goto drop;
 | 
			
		||||
 
 | 
			
		||||
-	if (p->state == BR_STATE_LEARNING)
 | 
			
		||||
+	if ((p->state == BR_STATE_LEARNING) && skb->protocol != htons(ETH_P_PAE))
 | 
			
		||||
 		goto drop;
 | 
			
		||||
 
 | 
			
		||||
 	BR_INPUT_SKB_CB(skb)->brdev = br->dev;
 | 
			
		||||
@@ -0,0 +1,11 @@
 | 
			
		||||
--- a/net/bridge/br_input.c
 | 
			
		||||
+++ b/net/bridge/br_input.c
 | 
			
		||||
@@ -58,7 +58,7 @@ int br_handle_frame_finish(struct sk_buf
 | 
			
		||||
 	    br_multicast_rcv(br, p, skb))
 | 
			
		||||
 		goto drop;
 | 
			
		||||
 
 | 
			
		||||
-	if (p->state == BR_STATE_LEARNING)
 | 
			
		||||
+	if ((p->state == BR_STATE_LEARNING) && skb->protocol != htons(ETH_P_PAE))
 | 
			
		||||
 		goto drop;
 | 
			
		||||
 
 | 
			
		||||
 	BR_INPUT_SKB_CB(skb)->brdev = br->dev;
 | 
			
		||||
@@ -0,0 +1,11 @@
 | 
			
		||||
--- a/net/bridge/br_input.c
 | 
			
		||||
+++ b/net/bridge/br_input.c
 | 
			
		||||
@@ -60,7 +60,7 @@ int br_handle_frame_finish(struct sk_buf
 | 
			
		||||
 	    br_multicast_rcv(br, p, skb))
 | 
			
		||||
 		goto drop;
 | 
			
		||||
 
 | 
			
		||||
-	if (p->state == BR_STATE_LEARNING)
 | 
			
		||||
+	if ((p->state == BR_STATE_LEARNING) && skb->protocol != htons(ETH_P_PAE))
 | 
			
		||||
 		goto drop;
 | 
			
		||||
 
 | 
			
		||||
 	BR_INPUT_SKB_CB(skb)->brdev = br->dev;
 | 
			
		||||
@@ -0,0 +1,11 @@
 | 
			
		||||
--- a/net/bridge/br_input.c
 | 
			
		||||
+++ b/net/bridge/br_input.c
 | 
			
		||||
@@ -60,7 +60,7 @@ int br_handle_frame_finish(struct sk_buf
 | 
			
		||||
 	    br_multicast_rcv(br, p, skb))
 | 
			
		||||
 		goto drop;
 | 
			
		||||
 
 | 
			
		||||
-	if (p->state == BR_STATE_LEARNING)
 | 
			
		||||
+	if ((p->state == BR_STATE_LEARNING) && skb->protocol != htons(ETH_P_PAE))
 | 
			
		||||
 		goto drop;
 | 
			
		||||
 
 | 
			
		||||
 	BR_INPUT_SKB_CB(skb)->brdev = br->dev;
 | 
			
		||||
@@ -0,0 +1,11 @@
 | 
			
		||||
--- a/net/bridge/br_input.c
 | 
			
		||||
+++ b/net/bridge/br_input.c
 | 
			
		||||
@@ -60,7 +60,7 @@ int br_handle_frame_finish(struct sk_buf
 | 
			
		||||
 	    br_multicast_rcv(br, p, skb))
 | 
			
		||||
 		goto drop;
 | 
			
		||||
 
 | 
			
		||||
-	if (p->state == BR_STATE_LEARNING)
 | 
			
		||||
+	if ((p->state == BR_STATE_LEARNING) && skb->protocol != htons(ETH_P_PAE))
 | 
			
		||||
 		goto drop;
 | 
			
		||||
 
 | 
			
		||||
 	BR_INPUT_SKB_CB(skb)->brdev = br->dev;
 | 
			
		||||
		Reference in New Issue
	
	Block a user