From a1f09a42a5238a562049716754842ecff6ab3751 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 10 Mar 2011 19:04:29 +0000 Subject: [PATCH] kernel: backport EAP bridge fix from r26015 git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@26019 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-2.6.30/281-bridge_always_accept_eap.patch | 11 +++++++++++ .../patches-2.6.32/271-bridge_always_accept_eap.patch | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 target/linux/generic-2.6/patches-2.6.30/281-bridge_always_accept_eap.patch create mode 100644 target/linux/generic-2.6/patches-2.6.32/271-bridge_always_accept_eap.patch diff --git a/target/linux/generic-2.6/patches-2.6.30/281-bridge_always_accept_eap.patch b/target/linux/generic-2.6/patches-2.6.30/281-bridge_always_accept_eap.patch new file mode 100644 index 000000000..e16a3f7bc --- /dev/null +++ b/target/linux/generic-2.6/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-2.6/patches-2.6.32/271-bridge_always_accept_eap.patch b/target/linux/generic-2.6/patches-2.6.32/271-bridge_always_accept_eap.patch new file mode 100644 index 000000000..e16a3f7bc --- /dev/null +++ b/target/linux/generic-2.6/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). */