aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.0/640-bridge_no_eap_forward.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2011-06-15 21:31:01 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2011-06-15 21:31:01 +0000
commit235e3319876d5d1354e2774ec73495fdeb2616ec (patch)
treed776ac5daed14d9e6ee5562e979d388420e8ff08 /target/linux/generic/patches-3.0/640-bridge_no_eap_forward.patch
parent0db9c2bd7d3620ba18fa784bda702d971783b4f6 (diff)
downloadupstream-235e3319876d5d1354e2774ec73495fdeb2616ec.tar.gz
upstream-235e3319876d5d1354e2774ec73495fdeb2616ec.tar.bz2
upstream-235e3319876d5d1354e2774ec73495fdeb2616ec.zip
linux/generic: Add support for 3.0-rc3
Also make linux identify itself properly as 3.0, not 3.0.0. Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com> SVN-Revision: 27191
Diffstat (limited to 'target/linux/generic/patches-3.0/640-bridge_no_eap_forward.patch')
-rw-r--r--target/linux/generic/patches-3.0/640-bridge_no_eap_forward.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.0/640-bridge_no_eap_forward.patch b/target/linux/generic/patches-3.0/640-bridge_no_eap_forward.patch
new file mode 100644
index 0000000000..dac898276d
--- /dev/null
+++ b/target/linux/generic/patches-3.0/640-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 && mdst->mglist) ||