kernel: allow EAP frames to pass through bridges even in learning state - fixes issue...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26015 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/generic/patches-2.6.30/281-bridge_always_accept_eap.patch b/target/linux/generic/patches-2.6.30/281-bridge_always_accept_eap.patch
new file mode 100644 (file)
index 0000000..e16a3f7
--- /dev/null
+++ b/target/linux/generic/patches-2.6.30/281-bridge_always_accept_eap.patch
@@ -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). */

diff --git a/target/linux/generic/patches-2.6.32/271-bridge_always_accept_eap.patch b/target/linux/generic/patches-2.6.32/271-bridge_always_accept_eap.patch
new file mode 100644 (file)
index 0000000..e16a3f7
--- /dev/null
+++ b/target/linux/generic/patches-2.6.32/271-bridge_always_accept_eap.patch
@@ -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). */

diff --git a/target/linux/generic/patches-2.6.34/271-bridge_always_accept_eap.patch b/target/linux/generic/patches-2.6.34/271-bridge_always_accept_eap.patch
new file mode 100644 (file)
index 0000000..af552c6
--- /dev/null
+++ b/target/linux/generic/patches-2.6.34/271-bridge_always_accept_eap.patch
@@ -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;

diff --git a/target/linux/generic/patches-2.6.35/271-bridge_always_accept_eap.patch b/target/linux/generic/patches-2.6.35/271-bridge_always_accept_eap.patch
new file mode 100644 (file)
index 0000000..3e2d2df
--- /dev/null
+++ b/target/linux/generic/patches-2.6.35/271-bridge_always_accept_eap.patch
@@ -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;

diff --git a/target/linux/generic/patches-2.6.36/271-bridge_always_accept_eap.patch b/target/linux/generic/patches-2.6.36/271-bridge_always_accept_eap.patch
new file mode 100644 (file)
index 0000000..e9bcabe
--- /dev/null
+++ b/target/linux/generic/patches-2.6.36/271-bridge_always_accept_eap.patch
@@ -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;

diff --git a/target/linux/generic/patches-2.6.37/271-bridge_always_accept_eap.patch b/target/linux/generic/patches-2.6.37/271-bridge_always_accept_eap.patch
new file mode 100644 (file)
index 0000000..e9bcabe
--- /dev/null
+++ b/target/linux/generic/patches-2.6.37/271-bridge_always_accept_eap.patch
@@ -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;

diff --git a/target/linux/generic/patches-2.6.38/271-bridge_always_accept_eap.patch b/target/linux/generic/patches-2.6.38/271-bridge_always_accept_eap.patch
new file mode 100644 (file)
index 0000000..e9bcabe
--- /dev/null
+++ b/target/linux/generic/patches-2.6.38/271-bridge_always_accept_eap.patch
@@ -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;