diff options
| author | Tomas Winkler | 2008-10-24 08:48:50 +0200 |
|---|---|---|
| committer | John W. Linville | 2008-11-01 00:02:23 +0100 |
| commit | ed7fafec5e566a30fb21586c98cbef76c306d209 (patch) | |
| tree | 846de6c21c2646b03c0772d3407b82b33c45286f | |
| parent | iwlwifi: refactor TX response flow (diff) | |
| download | kernel-qcow2-linux-ed7fafec5e566a30fb21586c98cbef76c306d209.tar.gz kernel-qcow2-linux-ed7fafec5e566a30fb21586c98cbef76c306d209.tar.xz kernel-qcow2-linux-ed7fafec5e566a30fb21586c98cbef76c306d209.zip | |
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>
| -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, 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)) |