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

Commit 164ae97e authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlagn: don't assign seqno to QoS Null frames 



802.11 says:
"Sequence numbers for QoS (+)Null frames may be
set to any value."

However, if we use the normal counters then peers
will get confused with aggregation since there'll
be holes in the sequence number sequence.

To avoid that, don't assign sequence numbers to
QoS Null frames.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi GUy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3bde2b68

drivers/net/wireless/iwlwifi/iwl-trans-pcie.c

+2 −2
Original line number Diff line number Diff line
@@ -1077,7 +1077,7 @@ static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb, 
		txq_id =

		    trans_pcie->ac_to_queue[ctx][skb_get_queue_mapping(skb)];



	if (ieee80211_is_data_qos(fc)) {

	if (ieee80211_is_data_qos(fc) && !ieee80211_is_qos_nullfunc(fc)) {

		u8 *qc = NULL;

		struct iwl_tid_data *tid_data;

		qc = ieee80211_get_qos_ctl(hdr);
@@ -1206,7 +1206,7 @@ static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb, 
	q->write_ptr = iwl_queue_inc_wrap(q->write_ptr, q->n_bd);

	iwl_txq_update_write_ptr(trans, txq);



	if (ieee80211_is_data_qos(fc)) {

	if (ieee80211_is_data_qos(fc) && !ieee80211_is_qos_nullfunc(fc)) {

		trans->shrd->tid_data[sta_id][tid].tfds_in_queue++;

		if (!ieee80211_has_morefrags(fc))

			trans->shrd->tid_data[sta_id][tid].seq_number =