summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-01-25 00:25:49 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-01-25 00:25:49 +0000
commitb50e3f0e0772bd248cc773217e49fde03aa17110 (patch)
tree26ce65768cb0abb064b5a7a87e0edce2258e0ab6
parent706010dbe1c98d4737f142ac402a6d86f6709f4e (diff)
kernel: when bridging, do not forward EAP frames to other ports, only deliver them locally
fixes WPA authentication issues with multiples APs that are connected to each other via bridges git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25095 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic/patches-2.6.30/280-bridge_no_eap_forward.patch15
-rw-r--r--target/linux/generic/patches-2.6.32/270-bridge_no_eap_forward.patch15
-rw-r--r--target/linux/generic/patches-2.6.34/270-bridge_no_eap_forward.patch15
-rw-r--r--target/linux/generic/patches-2.6.35/270-bridge_no_eap_forward.patch15
-rw-r--r--target/linux/generic/patches-2.6.36/270-bridge_no_eap_forward.patch15
-rw-r--r--target/linux/generic/patches-2.6.37/270-bridge_no_eap_forward.patch15
-rw-r--r--target/linux/generic/patches-2.6.38/270-bridge_no_eap_forward.patch15
7 files changed, 105 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.30/280-bridge_no_eap_forward.patch b/target/linux/generic/patches-2.6.30/280-bridge_no_eap_forward.patch
new file mode 100644
index 0000000000..6d50a8076c
--- /dev/null
+++ b/target/linux/generic/patches-2.6.30/280-bridge_no_eap_forward.patch
@@ -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) {
diff --git a/target/linux/generic/patches-2.6.32/270-bridge_no_eap_forward.patch b/target/linux/generic/patches-2.6.32/270-bridge_no_eap_forward.patch
new file mode 100644
index 0000000000..6d50a8076c
--- /dev/null
+++ b/target/linux/generic/patches-2.6.32/270-bridge_no_eap_forward.patch
@@ -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) {
diff --git a/target/linux/generic/patches-2.6.34/270-bridge_no_eap_forward.patch b/target/linux/generic/patches-2.6.34/270-bridge_no_eap_forward.patch
new file mode 100644
index 0000000000..10f0438f0d
--- /dev/null
+++ b/target/linux/generic/patches-2.6.34/270-bridge_no_eap_forward.patch
@@ -0,0 +1,15 @@
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -69,7 +69,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)) {
+ mdst = br_mdb_get(br, skb);
+ if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) {
+ if ((mdst && !hlist_unhashed(&mdst->mglist)) ||
diff --git a/target/linux/generic/patches-2.6.35/270-bridge_no_eap_forward.patch b/target/linux/generic/patches-2.6.35/270-bridge_no_eap_forward.patch
new file mode 100644
index 0000000000..9795242870
--- /dev/null
+++ b/target/linux/generic/patches-2.6.35/270-bridge_no_eap_forward.patch
@@ -0,0 +1,15 @@
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -71,7 +71,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)) {
+ mdst = br_mdb_get(br, skb);
+ if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) {
+ if ((mdst && !hlist_unhashed(&mdst->mglist)) ||
diff --git a/target/linux/generic/patches-2.6.36/270-bridge_no_eap_forward.patch b/target/linux/generic/patches-2.6.36/270-bridge_no_eap_forward.patch
new file mode 100644
index 0000000000..da71980743
--- /dev/null
+++ b/target/linux/generic/patches-2.6.36/270-bridge_no_eap_forward.patch
@@ -0,0 +1,15 @@
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -73,7 +73,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)) {
+ mdst = br_mdb_get(br, skb);
+ if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) {
+ if ((mdst && !hlist_unhashed(&mdst->mglist)) ||
diff --git a/target/linux/generic/patches-2.6.37/270-bridge_no_eap_forward.patch b/target/linux/generic/patches-2.6.37/270-bridge_no_eap_forward.patch
new file mode 100644
index 0000000000..da71980743
--- /dev/null
+++ b/target/linux/generic/patches-2.6.37/270-bridge_no_eap_forward.patch
@@ -0,0 +1,15 @@
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -73,7 +73,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)) {
+ mdst = br_mdb_get(br, skb);
+ if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) {
+ if ((mdst && !hlist_unhashed(&mdst->mglist)) ||
diff --git a/target/linux/generic/patches-2.6.38/270-bridge_no_eap_forward.patch b/target/linux/generic/patches-2.6.38/270-bridge_no_eap_forward.patch
new file mode 100644
index 0000000000..883a7d0649
--- /dev/null
+++ b/target/linux/generic/patches-2.6.38/270-bridge_no_eap_forward.patch
@@ -0,0 +1,15 @@
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -77,7 +77,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)) {
+ mdst = br_mdb_get(br, skb);
+ if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) {
+ if ((mdst && !hlist_unhashed(&mdst->mglist)) ||