]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
mac80211: drop control frames after processing
authorJohannes Berg <johannes@sipsolutions.net>
Sun, 30 May 2010 12:53:43 +0000 (14:53 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 3 Jun 2010 18:10:45 +0000 (14:10 -0400)
After ieee80211_rx_h_ctrl() processing we only
want to process management (including action)
frames, so there's no point in letting control
frames continue.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/rx.c

index 0ade267939189f0873b1cf57d38dc64f820550f6..0b9898ac4d87639f7c3c53d213483a88cdd73a82 100644 (file)
@@ -1844,7 +1844,12 @@ ieee80211_rx_h_ctrl(struct ieee80211_rx_data *rx, struct sk_buff_head *frames)
                return RX_QUEUED;
        }
 
-       return RX_CONTINUE;
+       /*
+        * After this point, we only want management frames,
+        * so we can drop all remaining control frames to
+        * cooked monitor interfaces.
+        */
+       return RX_DROP_MONITOR;
 }
 
 static void ieee80211_process_sa_query_req(struct ieee80211_sub_if_data *sdata,