aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-09-18 06:24:20 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-09-24 16:18:03 -0400
commit2ff6a6d4e92270283432690adf53a7e5ab186d19 (patch)
tree4535441a1ebf6f7515c57549db77af241342b245 /net/mac80211
parent79617deeebb9cf089e2bc2aad19743b1209043f6 (diff)
mac80211: fix mesh action frame handling
When I split off the action frame handling I made the code drop all action frames we don't want to handle. This is wrong since some action frames are actually handled via rx_h_mgmt through being queued to the sta/mesh implementations. Thanks to Li YanBo for noticing the problem. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Cc: Li YanBo <dreamfly281@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/rx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 2efa4dd47b5d..c489865761bc 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1557,7 +1557,7 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
1557 */ 1557 */
1558 if (sdata->vif.type != NL80211_IFTYPE_STATION && 1558 if (sdata->vif.type != NL80211_IFTYPE_STATION &&
1559 sdata->vif.type != NL80211_IFTYPE_ADHOC) 1559 sdata->vif.type != NL80211_IFTYPE_ADHOC)
1560 return RX_DROP_MONITOR; 1560 return RX_CONTINUE;
1561 1561
1562 switch (mgmt->u.action.category) { 1562 switch (mgmt->u.action.category) {
1563 case WLAN_CATEGORY_BACK: 1563 case WLAN_CATEGORY_BACK: