summaryrefslogtreecommitdiff
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-06-29 12:07:37 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-06-29 12:07:37 -0400
commit42fb0b0278e6b9a44bee8adec051de5f43e10b2b (patch)
treef53513819d11445385346cf75be05054dae3438d /net/mac80211/rx.c
parent34202e28fe7fc8551313f9a035a8857db83de757 (diff)
parentc9015b24b262bc7ea56cfd5d78983a73fb5ebd7d (diff)
downloadlinux-3.10-42fb0b0278e6b9a44bee8adec051de5f43e10b2b.tar.gz
linux-3.10-42fb0b0278e6b9a44bee8adec051de5f43e10b2b.tar.bz2
linux-3.10-42fb0b0278e6b9a44bee8adec051de5f43e10b2b.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index ab5185054e6..839cac8fab5 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2434,7 +2434,7 @@ ieee80211_rx_h_action_return(struct ieee80211_rx_data *rx)
* frames that we didn't handle, including returning unknown
* ones. For all other modes we will return them to the sender,
* setting the 0x80 bit in the action category, as required by
- * 802.11-2007 7.3.1.11.
+ * 802.11-2012 9.24.4.
* Newer versions of hostapd shall also use the management frame
* registration mechanisms, but older ones still use cooked
* monitor interfaces so push all frames there.
@@ -2444,6 +2444,9 @@ ieee80211_rx_h_action_return(struct ieee80211_rx_data *rx)
sdata->vif.type == NL80211_IFTYPE_AP_VLAN))
return RX_DROP_MONITOR;
+ if (is_multicast_ether_addr(mgmt->da))
+ return RX_DROP_MONITOR;
+
/* do not return rejected action frames */
if (mgmt->u.action.category & 0x80)
return RX_DROP_UNUSABLE;