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

Commit b5326db8 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Wey-Yi Guy
Browse files

iwlwifi: don't accept Tx packets when draining HW queues 



If the agg SM is in IWL_EMPTYING_HW_QUEUE_ADDBA or in
IWL_EMPTYING_HW_QUEUE_DELBA, we are not supposed to get Tx packets
from mac80211. mac80211 is supposed to buffer these packets for us.
A few issues have been identified in this mechanism, not all of them
were fixed.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent fdf426a3

drivers/net/wireless/iwlwifi/iwl-agn-tx.c

+8 −0
Original line number Diff line number Diff line
@@ -388,6 +388,14 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 
			goto drop_unlock_sta;

		}



		/* We can receive packets from the stack in IWL_AGG_{ON,OFF}

		 * only. Check this here.

		 */

		if (WARN_ONCE(tid_data->agg.state != IWL_AGG_ON &&

		    tid_data->agg.state != IWL_AGG_OFF,

		    "Tx while agg.state = %d", tid_data->agg.state))

			goto drop_unlock_sta;



		seq_number = tid_data->seq_number;

		seq_number &= IEEE80211_SCTL_SEQ;

		hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);