mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-01-01 18:53:56 +02:00
995df6badb
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25039 3c298f89-4303-0410-b956-a3cf2f4a3e73
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
--- a/net/mac80211/rx.c
|
|
+++ b/net/mac80211/rx.c
|
|
@@ -1556,17 +1556,36 @@ __ieee80211_data_to_8023(struct ieee8021
|
|
{
|
|
struct ieee80211_sub_if_data *sdata = rx->sdata;
|
|
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data;
|
|
+ bool check_port_control = false;
|
|
+ struct ethhdr *ehdr;
|
|
+ int ret;
|
|
|
|
if (ieee80211_has_a4(hdr->frame_control) &&
|
|
sdata->vif.type == NL80211_IFTYPE_AP_VLAN && !sdata->u.vlan.sta)
|
|
return -1;
|
|
|
|
+ if (sdata->vif.type == NL80211_IFTYPE_STATION &&
|
|
+ !!sdata->u.mgd.use_4addr != !!ieee80211_has_a4(hdr->frame_control)) {
|
|
+
|
|
+ if (!sdata->u.mgd.use_4addr)
|
|
+ return -1;
|
|
+ else
|
|
+ check_port_control = true;
|
|
+ }
|
|
+
|
|
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;
|
|
+
|
|
+ ret = ieee80211_data_to_8023(rx->skb, sdata->vif.addr, sdata->vif.type);
|
|
+ if (ret < 0 || !check_port_control)
|
|
+ return ret;
|
|
+
|
|
+ ehdr = (struct ethhdr *) rx->skb->data;
|
|
+ if (ehdr->h_proto != rx->sdata->control_port_protocol)
|
|
return -1;
|
|
|
|
- return ieee80211_data_to_8023(rx->skb, sdata->vif.addr, sdata->vif.type);
|
|
+ return 0;
|
|
}
|
|
|
|
/*
|