mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-23 22:32:25 +03:00
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26128 3c298f89-4303-0410-b956-a3cf2f4a3e73
68 lines
2.0 KiB
Diff
68 lines
2.0 KiB
Diff
--- a/net/mac80211/rx.c
|
|
+++ b/net/mac80211/rx.c
|
|
@@ -1582,7 +1582,7 @@ ieee80211_drop_unencrypted_mgmt(struct i
|
|
}
|
|
|
|
static int
|
|
-__ieee80211_data_to_8023(struct ieee80211_rx_data *rx)
|
|
+__ieee80211_data_to_8023(struct ieee80211_rx_data *rx, bool *port_control)
|
|
{
|
|
struct ieee80211_sub_if_data *sdata = rx->sdata;
|
|
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data;
|
|
@@ -1590,6 +1590,7 @@ __ieee80211_data_to_8023(struct ieee8021
|
|
struct ethhdr *ehdr;
|
|
int ret;
|
|
|
|
+ *port_control = false;
|
|
if (ieee80211_has_a4(hdr->frame_control) &&
|
|
sdata->vif.type == NL80211_IFTYPE_AP_VLAN && !sdata->u.vlan.sta)
|
|
return -1;
|
|
@@ -1608,11 +1609,14 @@ __ieee80211_data_to_8023(struct ieee8021
|
|
return -1;
|
|
|
|
ret = ieee80211_data_to_8023(rx->skb, sdata->vif.addr, sdata->vif.type);
|
|
- if (ret < 0 || !check_port_control)
|
|
+ if (ret < 0)
|
|
return ret;
|
|
|
|
ehdr = (struct ethhdr *) rx->skb->data;
|
|
- if (ehdr->h_proto != rx->sdata->control_port_protocol)
|
|
+ if (ehdr->h_proto == rx->sdata->control_port_protocol)
|
|
+ *port_control = true;
|
|
+
|
|
+ if (check_port_control && !*port_control)
|
|
return -1;
|
|
|
|
return 0;
|
|
@@ -1913,6 +1917,7 @@ ieee80211_rx_h_data(struct ieee80211_rx_
|
|
struct net_device *dev = sdata->dev;
|
|
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data;
|
|
__le16 fc = hdr->frame_control;
|
|
+ bool port_control;
|
|
int err;
|
|
|
|
if (unlikely(!ieee80211_is_data(hdr->frame_control)))
|
|
@@ -1929,13 +1934,21 @@ ieee80211_rx_h_data(struct ieee80211_rx_
|
|
sdata->vif.type == NL80211_IFTYPE_AP)
|
|
return RX_DROP_MONITOR;
|
|
|
|
- err = __ieee80211_data_to_8023(rx);
|
|
+ err = __ieee80211_data_to_8023(rx, &port_control);
|
|
if (unlikely(err))
|
|
return RX_DROP_UNUSABLE;
|
|
|
|
if (!ieee80211_frame_allowed(rx, fc))
|
|
return RX_DROP_MONITOR;
|
|
|
|
+ if (rx->sdata->vif.type == NL80211_IFTYPE_AP_VLAN &&
|
|
+ unlikely(port_control) && sdata->bss) {
|
|
+ sdata = container_of(sdata->bss, struct ieee80211_sub_if_data,
|
|
+ u.ap);
|
|
+ dev = sdata->dev;
|
|
+ rx->sdata = sdata;
|
|
+ }
|
|
+
|
|
rx->skb->dev = dev;
|
|
|
|
dev->stats.rx_packets++;
|