diff options
| author |   Johannes Berg <johannes@sipsolutions.net> | 2009-10-30 12:55:03 +0100 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2009-10-30 16:50:39 -0400 |
| commit | 22403def134e2c1017cb04ae9129a38e841b2d8c (patch) | |
| tree | b513210b85fad90cd4309162cfbf30972bf996fa /net/mac80211 | |
| parent | wl1271: fix init loop timeout (diff) | |
| download | linux-dev-22403def134e2c1017cb04ae9129a38e841b2d8c.tar.xz linux-dev-22403def134e2c1017cb04ae9129a38e841b2d8c.zip | |
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>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/rx.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index f862399f7ce1..51cb8bc3af81 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; |