Commit 22403def authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville

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: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e7d17cf4
...@@ -472,7 +472,7 @@ static inline int ieee80211_is_cfendack(__le16 fc) ...@@ -472,7 +472,7 @@ static inline int ieee80211_is_cfendack(__le16 fc)
} }
/** /**
* ieee80211_is_nullfunc - check if FTYPE=IEEE80211_FTYPE_DATA and STYPE=IEEE80211_STYPE_NULLFUNC * ieee80211_is_nullfunc - check if frame is a regular (non-QoS) nullfunc frame
* @fc: frame control bytes in little-endian byteorder * @fc: frame control bytes in little-endian byteorder
*/ */
static inline int ieee80211_is_nullfunc(__le16 fc) static inline int ieee80211_is_nullfunc(__le16 fc)
...@@ -481,6 +481,16 @@ static inline int ieee80211_is_nullfunc(__le16 fc) ...@@ -481,6 +481,16 @@ static inline int ieee80211_is_nullfunc(__le16 fc)
cpu_to_le16(IEEE80211_FTYPE_DATA | IEEE80211_STYPE_NULLFUNC); cpu_to_le16(IEEE80211_FTYPE_DATA | IEEE80211_STYPE_NULLFUNC);
} }
/**
* ieee80211_is_qos_nullfunc - check if frame is a QoS nullfunc frame
* @fc: frame control bytes in little-endian byteorder
*/
static inline int ieee80211_is_qos_nullfunc(__le16 fc)
{
return (fc & cpu_to_le16(IEEE80211_FCTL_FTYPE | IEEE80211_FCTL_STYPE)) ==
cpu_to_le16(IEEE80211_FTYPE_DATA | IEEE80211_STYPE_QOS_NULLFUNC);
}
struct ieee80211s_hdr { struct ieee80211s_hdr {
u8 flags; u8 flags;
u8 ttl; u8 ttl;
......
...@@ -886,12 +886,17 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx) ...@@ -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. */ * Drop (qos-)data::nullfunc frames silently, since they
if (ieee80211_is_nullfunc(hdr->frame_control)) { * 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); 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++; sta->rx_packets++;
dev_kfree_skb(rx->skb); dev_kfree_skb(rx->skb);
return RX_QUEUED; return RX_QUEUED;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment