mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-09-13 04:29:17 +03:00
c9796711a9
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25008 3c298f89-4303-0410-b956-a3cf2f4a3e73
19 lines
745 B
Diff
19 lines
745 B
Diff
--- 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);
|