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

Commit ed7fafec authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

iwlwifi: don't update TFD free counter for invalid station 



This patch makes sure that station table is not accessed
with invalid station id in 4965 TX response path

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Reported-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3fd07a1e

drivers/net/wireless/iwlwifi/iwl-4965.c

+2 −2
Original line number Diff line number Diff line
@@ -2236,7 +2236,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, 
				   tx_resp->failure_frame);



		freed = iwl_tx_queue_reclaim(priv, txq_id, index);

		if (qc)

		if (qc && likely(sta_id != IWL_INVALID_STATION))

			priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;



		if (priv->mac80211_registered &&
@@ -2244,7 +2244,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, 
			ieee80211_wake_queue(priv->hw, txq_id);

	}



	if (qc)

	if (qc && likely(sta_id != IWL_INVALID_STATION))

		iwl_txq_check_empty(priv, sta_id, tid, txq_id);



	if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK))