diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-01-15 13:41:10 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-01-15 13:41:10 +0000 |
commit | 1a7a36b0a44b1cdd6180f0d6c5b7cd360bb59473 (patch) | |
tree | a77ffab19747e0c8f70785e827ff9cb40891344c /package/mac80211 | |
parent | 098e2d7ca1532be6301cec2343956c9bee7ea583 (diff) | |
download | upstream-1a7a36b0a44b1cdd6180f0d6c5b7cd360bb59473.tar.gz upstream-1a7a36b0a44b1cdd6180f0d6c5b7cd360bb59473.tar.bz2 upstream-1a7a36b0a44b1cdd6180f0d6c5b7cd360bb59473.zip |
mac80211: fix frames looping back to a wds station
SVN-Revision: 25008
Diffstat (limited to 'package/mac80211')
-rw-r--r-- | package/mac80211/patches/560-mac80211_wds_sta_fix.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/package/mac80211/patches/560-mac80211_wds_sta_fix.patch b/package/mac80211/patches/560-mac80211_wds_sta_fix.patch new file mode 100644 index 0000000000..a0418b6309 --- /dev/null +++ b/package/mac80211/patches/560-mac80211_wds_sta_fix.patch @@ -0,0 +1,18 @@ +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c +@@ -1561,9 +1561,13 @@ __ieee80211_data_to_8023(struct ieee8021 + sdata->vif.type == NL80211_IFTYPE_AP_VLAN && !sdata->u.vlan.sta) + return -1; + ++ if (!ieee80211_802_1x_port_control(rx) && ++ sdata->vif.type == NL80211_IFTYPE_STATION && ++ !!sdata->u.mgd.use_4addr != !!ieee80211_has_a4(hdr->frame_control)) ++ return -1; ++ + if (is_multicast_ether_addr(hdr->addr1) && +- ((sdata->vif.type == NL80211_IFTYPE_AP_VLAN && sdata->u.vlan.sta) || +- (sdata->vif.type == NL80211_IFTYPE_STATION && sdata->u.mgd.use_4addr))) ++ sdata->vif.type == NL80211_IFTYPE_AP_VLAN && sdata->u.vlan.sta) + return -1; + + return ieee80211_data_to_8023(rx->skb, sdata->vif.addr, sdata->vif.type); |