mac80211: also drop qos-nullfunc frames silently

We drop nullfunc frames, but not qos-nullfunc frames,
even though those could be used for PS state control
as well.

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

1 files changed, 10 insertions, 5 deletions

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index f862399f7ce..51cb8bc3af8 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -886,12 +886,17 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx)
                 }
         }
 
-        /* Drop data::nullfunc frames silently, since they are used only to
-         * control station power saving mode. */
-        if (ieee80211_is_nullfunc(hdr->frame_control)) {
+        /*
+         * Drop (qos-)data::nullfunc frames silently, since they
+         * are used only to control station power saving mode.
+         */
+        if (ieee80211_is_nullfunc(hdr->frame_control) ||
+            ieee80211_is_qos_nullfunc(hdr->frame_control)) {
                 I802_DEBUG_INC(rx->local->rx_handlers_drop_nullfunc);
-                /* Update counter and free packet here to avoid counting this
-                 * as a dropped packed. */
+                /*
+                 * Update counter and free packet here to avoid
+                 * counting this as a dropped packed.
+                 */
                 sta->rx_packets++;
                 dev_kfree_skb(rx->skb);
                 return RX_QUEUED;