diff options
author | David S. Miller <davem@davemloft.net> | 2010-06-16 13:41:55 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-16 13:41:55 -0700 |
commit | d8d326dc7ae6bec2a999d674c5babb6bf490587a (patch) | |
tree | 0169a23e34712e4a34db9c3dd658c14a59ded5d9 /drivers/net/wireless/iwlwifi/iwl-agn-tx.c | |
parent | bridge: Fix OOM crash in deliver_clone (diff) | |
parent | mac80211: fix warn, enum may be used uninitialized (diff) | |
download | linux-dev-d8d326dc7ae6bec2a999d674c5babb6bf490587a.tar.xz linux-dev-d8d326dc7ae6bec2a999d674c5babb6bf490587a.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-tx.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c index a732f1094e5d..7d614c4d3c62 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c @@ -1299,6 +1299,11 @@ void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv, sta_id = ba_resp->sta_id; tid = ba_resp->tid; agg = &priv->stations[sta_id].tid[tid].agg; + if (unlikely(agg->txq_id != scd_flow)) { + IWL_ERR(priv, "BA scd_flow %d does not match txq_id %d\n", + scd_flow, agg->txq_id); + return; + } /* Find index just before block-ack window */ index = iwl_queue_dec_wrap(ba_resp_scd_ssn & 0xff, txq->q.n_bd); |