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 | 02e44fa84c81382ec55830367584bc7aa33cb797 (patch) | |
| tree | 0f7ea0c870bea817fced5d6827f719e1781dc5a7 | |
| parent | f6ffc94274743d89ab46bec245e65230ce006791 (diff) | |
| download | upstream-02e44fa84c81382ec55830367584bc7aa33cb797.tar.gz upstream-02e44fa84c81382ec55830367584bc7aa33cb797.tar.bz2 upstream-02e44fa84c81382ec55830367584bc7aa33cb797.zip | |
mac80211: fix frames looping back to a wds station
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25008 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -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); |