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

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

iwlwifi: need check for valid qos packet before free 



For 4965, need to check it is valid qos frame before free, only valid
QoS frame has the tid used to free the packets.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 11446011

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

+9 −4
Original line number Diff line number Diff line
@@ -2015,7 +2015,9 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, 
			IWL_DEBUG_TX_REPLY(priv, "Retry scheduler reclaim scd_ssn "

					   "%d index %d\n", scd_ssn , index);

			freed = iwl_tx_queue_reclaim(priv, txq_id, index);

			iwl_free_tfds_in_queue(priv, sta_id, tid, freed);

			if (qc)

				iwl_free_tfds_in_queue(priv, sta_id,

						       tid, freed);



			if (priv->mac80211_registered &&

			    (iwl_queue_space(&txq->q) > txq->q.low_mark) &&
@@ -2041,13 +2043,16 @@ 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))

			iwl_free_tfds_in_queue(priv, sta_id, tid, freed);

		else if (sta_id == IWL_INVALID_STATION)

			IWL_DEBUG_TX_REPLY(priv, "Station not known\n");



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