iwlwifi: don't update TFD free counter for invalid station
authorTomas Winkler <tomas.winkler@intel.com>
Fri, 24 Oct 2008 06:48:50 +0000 (23:48 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 31 Oct 2008 23:02:23 +0000 (19:02 -0400)
This patch makes sure that station table is not accessed
with invalid station id in 4965 TX response path

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Reported-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-4965.c

index 881bf04725641f17ce009ec5070fb4bca7eaa264..741b425b5883a038a71365050cf7f4e47b51e11f 100644 (file)
@@ -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))