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

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

mac80211: fix A-MSDU aggregation with fast-xmit + txq 



A-MSDU aggregation alters the QoS header after a frame has been
enqueued, so it needs to be ready before enqueue and not overwritten
again afterwards

Fixes: bb42f2d1 ("mac80211: Move reorder-sensitive TX handlers to after TXQ dequeue")
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Acked-by: default avatarToke Høiland-Jørgensen <toke@toke.dk>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent fff712cb

net/mac80211/tx.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -3210,7 +3210,6 @@ static void ieee80211_xmit_fast_finish(struct ieee80211_sub_if_data *sdata, 




	if (hdr->frame_control & cpu_to_le16(IEEE80211_STYPE_QOS_DATA)) {

	if (hdr->frame_control & cpu_to_le16(IEEE80211_STYPE_QOS_DATA)) {

		tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK;

		tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK;

		*ieee80211_get_qos_ctl(hdr) = tid;

		hdr->seq_ctrl = ieee80211_tx_next_seq(sta, tid);

		hdr->seq_ctrl = ieee80211_tx_next_seq(sta, tid);

	} else {

	} else {

		info->flags |= IEEE80211_TX_CTL_ASSIGN_SEQ;

		info->flags |= IEEE80211_TX_CTL_ASSIGN_SEQ;
@@ -3335,6 +3334,11 @@ static bool ieee80211_xmit_fast(struct ieee80211_sub_if_data *sdata, 
		      (tid_tx ? IEEE80211_TX_CTL_AMPDU : 0);

		      (tid_tx ? IEEE80211_TX_CTL_AMPDU : 0);

	info->control.flags = IEEE80211_TX_CTRL_FAST_XMIT;

	info->control.flags = IEEE80211_TX_CTRL_FAST_XMIT;





	if (hdr->frame_control & cpu_to_le16(IEEE80211_STYPE_QOS_DATA)) {

		tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK;

		*ieee80211_get_qos_ctl(hdr) = tid;

	}



	__skb_queue_head_init(&tx.skbs);

	__skb_queue_head_init(&tx.skbs);





	tx.flags = IEEE80211_TX_UNICAST;

	tx.flags = IEEE80211_TX_UNICAST;