Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4ba544c authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: fix bufferable MMPDU RX handling 



Action, disassoc and deauth frames are bufferable, and as such don't
have the PM bit in the frame control field reserved which means we
need to react to the bit when receiving in such a frame.

Fix this by introducing a new helper ieee80211_is_bufferable_mmpdu()
and using it for the RX path that currently ignores the PM bit in
any non-data frames for doze->wake transitions, but listens to it in
all frames for wake->doze transitions, both of which are wrong.

Also use the new helper in the TX path to clean up the code.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 953467d3

include/linux/ieee80211.h

+14 −0
Original line number Diff line number Diff line
@@ -596,6 +596,20 @@ static inline int ieee80211_is_qos_nullfunc(__le16 fc) 
	       cpu_to_le16(IEEE80211_FTYPE_DATA | IEEE80211_STYPE_QOS_NULLFUNC);

}



/**

 * ieee80211_is_bufferable_mmpdu - check if frame is bufferable MMPDU

 * @fc: frame control field in little-endian byteorder

 */

static inline bool ieee80211_is_bufferable_mmpdu(__le16 fc)

{

	/* IEEE 802.11-2012, definition of "bufferable management frame";

	 * note that this ignores the IBSS special case. */

	return ieee80211_is_mgmt(fc) &&

	       (ieee80211_is_action(fc) ||

		ieee80211_is_disassoc(fc) ||

		ieee80211_is_deauth(fc));

}



/**

 * ieee80211_is_first_frag - check if IEEE80211_SCTL_FRAG is not set

 * @seq_ctrl: frame sequence control bytes in little-endian byteorder

net/mac80211/rx.c

+8 −11
Original line number Diff line number Diff line
@@ -1311,18 +1311,15 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx) 
	    !ieee80211_has_morefrags(hdr->frame_control) &&

	    !(status->rx_flags & IEEE80211_RX_DEFERRED_RELEASE) &&

	    (rx->sdata->vif.type == NL80211_IFTYPE_AP ||

	     rx->sdata->vif.type == NL80211_IFTYPE_AP_VLAN)) {

		if (test_sta_flag(sta, WLAN_STA_PS_STA)) {

			/*

			 * Ignore doze->wake transitions that are

			 * indicated by non-data frames, the standard

			 * is unclear here, but for example going to

			 * PS mode and then scanning would cause a

			 * doze->wake transition for the probe request,

			 * and that is clearly undesirable.

	     rx->sdata->vif.type == NL80211_IFTYPE_AP_VLAN) &&

	    /* PM bit is only checked in frames where it isn't reserved,

	     * in AP mode it's reserved in non-bufferable management frames

	     * (cf. IEEE 802.11-2012 8.2.4.1.7 Power Management field)

	     */

			if (ieee80211_is_data(hdr->frame_control) &&

			    !ieee80211_has_pm(hdr->frame_control))

	    (!ieee80211_is_mgmt(hdr->frame_control) ||

	     ieee80211_is_bufferable_mmpdu(hdr->frame_control))) {

		if (test_sta_flag(sta, WLAN_STA_PS_STA)) {

			if (!ieee80211_has_pm(hdr->frame_control))

				sta_ps_end(sta);

		} else {

			if (ieee80211_has_pm(hdr->frame_control))

net/mac80211/tx.c

+1 −4
Original line number Diff line number Diff line
@@ -522,11 +522,8 @@ ieee80211_tx_h_ps_buf(struct ieee80211_tx_data *tx) 
	if (unlikely(tx->flags & IEEE80211_TX_PS_BUFFERED))

		return TX_CONTINUE;



	/* only deauth, disassoc and action are bufferable MMPDUs */

	if (ieee80211_is_mgmt(hdr->frame_control) &&

	    !ieee80211_is_deauth(hdr->frame_control) &&

	    !ieee80211_is_disassoc(hdr->frame_control) &&

	    !ieee80211_is_action(hdr->frame_control)) {

	    !ieee80211_is_bufferable_mmpdu(hdr->frame_control)) {

		if (tx->flags & IEEE80211_TX_UNICAST)

			info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;

		return TX_CONTINUE;