From 55e41c6fa50c64efad7d28474a38617ee02ce423 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 27 Jun 2012 15:38:56 +0200 Subject: [PATCH] --- yaml --- r: 311621 b: refs/heads/master c: 4b5ebccc40843104d980f0714bc86bfcd5568941 h: refs/heads/master i: 311619: 543a7615428cdd1fc522054d5c81d3cb9c8f86aa v: v3 --- [refs] | 2 +- trunk/net/mac80211/rx.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cebe3011f1e5..1103ca60ec88 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7508b657967cf664b5aa0f6367d05016e7e3bc2a +refs/heads/master: 4b5ebccc40843104d980f0714bc86bfcd5568941 diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c index 7bcecf73aafb..965e6ec0adb6 100644 --- a/trunk/net/mac80211/rx.c +++ b/trunk/net/mac80211/rx.c @@ -2455,7 +2455,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. @@ -2465,6 +2465,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;