diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-27 18:01:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-27 18:01:13 -0700 |
| commit | ed85f2c3b2b72bd20f617ac749f5c22be8d0f66e (patch) | |
| tree | cb077293e1b36a5d6e2a138deb9663078a2d850e /drivers/net/wireless/iwlwifi/iwl-4965-rs.c | |
| parent | bc09dff198e67a98a82c42000006b39f6d502031 (diff) | |
| parent | e5225b397308f9eea86327293b73dc88068e0179 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.26
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965-rs.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965-rs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c index 7d7ce7489ab..735eadd57d1 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c @@ -397,7 +397,7 @@ static void rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv, DECLARE_MAC_BUF(mac); spin_lock_bh(&sta->ampdu_mlme.ampdu_tx); - state = sta->ampdu_mlme.tid_tx[tid].state; + state = sta->ampdu_mlme.tid_state_tx[tid]; spin_unlock_bh(&sta->ampdu_mlme.ampdu_tx); if (state == HT_AGG_STATE_IDLE && |