diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2008-10-24 02:48:50 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-10-31 19:02:23 -0400 |
commit | ed7fafec5e566a30fb21586c98cbef76c306d209 (patch) | |
tree | 846de6c21c2646b03c0772d3407b82b33c45286f /drivers | |
parent | 3fd07a1e5aba89d4be3696c46cb7297f1873195a (diff) |
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: 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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 881bf0472564..741b425b5883 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
@@ -2236,7 +2236,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, | |||
2236 | tx_resp->failure_frame); | 2236 | tx_resp->failure_frame); |
2237 | 2237 | ||
2238 | freed = iwl_tx_queue_reclaim(priv, txq_id, index); | 2238 | freed = iwl_tx_queue_reclaim(priv, txq_id, index); |
2239 | if (qc) | 2239 | if (qc && likely(sta_id != IWL_INVALID_STATION)) |
2240 | priv->stations[sta_id].tid[tid].tfds_in_queue -= freed; | 2240 | priv->stations[sta_id].tid[tid].tfds_in_queue -= freed; |
2241 | 2241 | ||
2242 | if (priv->mac80211_registered && | 2242 | if (priv->mac80211_registered && |
@@ -2244,7 +2244,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, | |||
2244 | ieee80211_wake_queue(priv->hw, txq_id); | 2244 | ieee80211_wake_queue(priv->hw, txq_id); |
2245 | } | 2245 | } |
2246 | 2246 | ||
2247 | if (qc) | 2247 | if (qc && likely(sta_id != IWL_INVALID_STATION)) |
2248 | iwl_txq_check_empty(priv, sta_id, tid, txq_id); | 2248 | iwl_txq_check_empty(priv, sta_id, tid, txq_id); |
2249 | 2249 | ||
2250 | if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK)) | 2250 | if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK)) |