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

Commit 277d916f authored by Felix Fietkau's avatar Felix Fietkau Committed by Johannes Berg
Browse files

mac80211: move "bufferable MMPDU" check to fix AP mode scan 



The check needs to apply to both multicast and unicast packets,
otherwise probe requests on AP mode scans are sent through the multicast
buffer queue, which adds long delays (often longer than the scanning
interval).

Cc: stable@vger.kernel.org
Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent c0e30763

net/mac80211/tx.c

+13 −10
Original line number Diff line number Diff line
@@ -463,7 +463,6 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx) 
{

	struct sta_info *sta = tx->sta;

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb);

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data;

	struct ieee80211_local *local = tx->local;



	if (unlikely(!sta))
@@ -474,15 +473,6 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx) 
		     !(info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER))) {

		int ac = skb_get_queue_mapping(tx->skb);



		/* 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)) {

			info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;

			return TX_CONTINUE;

		}



		ps_dbg(sta->sdata, "STA %pM aid %d: PS buffer for AC %d\n",

		       sta->sta.addr, sta->sta.aid, ac);

		if (tx->local->total_ps_buffered >= TOTAL_MAX_TX_BUFFER)
@@ -525,9 +515,22 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx) 
static ieee80211_tx_result debug_noinline

ieee80211_tx_h_ps_buf(struct ieee80211_tx_data *tx)

{

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb);

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data;



	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)) {

		if (tx->flags & IEEE80211_TX_UNICAST)

			info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;

		return TX_CONTINUE;

	}



	if (tx->flags & IEEE80211_TX_UNICAST)

		return ieee80211_tx_h_unicast_ps_buf(tx);

	else