Commit 50f36ae6 authored Sep 24, 2015 by Felix Fietkau Committed by Johannes Berg Sep 29, 2015

mac80211: fix tx sequence number assignment with software queue + fast-xmit



When using software queueing, tx sequence number assignment happens at
ieee80211_tx_dequeue time, so the fast-xmit codepath must not do that.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 44674d9c

net/mac80211/tx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2767,6 +2767,7 @@ static bool ieee80211_xmit_fast(struct ieee80211_sub_if_data *sdata,

		if (hdr->frame_control & cpu_to_le16(IEEE80211_STYPE_QOS_DATA)) {
		*ieee80211_get_qos_ctl(hdr) = tid;
		if (!sta->sta.txq[0])
		hdr->seq_ctrl = ieee80211_tx_next_seq(sta, tid);
		} else {
		info->flags \|= IEEE80211_TX_CTL_ASSIGN_SEQ;