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

Commit be6b38bc authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlwifi: counting number of tfds can be free for 4965 



Forget one hunk in 4965 during "iwlwifi: error checking for number of tfds
in queue" patch.

Reported-by: default avatarShanyu Zhao <shanyu.zhao@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
CC: stable@kernel.org
parent f6c8f152

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

+2 −4
Original line number Diff line number Diff line
@@ -2041,15 +2041,13 @@ 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 && likely(sta_id != IWL_INVALID_STATION))

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

		iwl_free_tfds_in_queue(priv, sta_id, tid, freed);



		if (priv->mac80211_registered &&

		    (iwl_queue_space(&txq->q) > txq->q.low_mark))

			iwl_wake_queue(priv, txq_id);

	}



	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))