diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-21 02:57:56 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-21 02:57:56 +0200 |
| commit | e46754f8c9333170f11780d8e3a70da1b1a88338 (patch) | |
| tree | 9b7ac1c7cb4c147c69767908c6dcb7633fb03f12 /net/mac80211/agg-tx.c | |
| parent | 8139too: Fix a typo in the function name. (diff) | |
| parent | mac80211: pass HT changes to driver when off channel (diff) | |
| download | linux-e46754f8c9333170f11780d8e3a70da1b1a88338.tar.xz linux-e46754f8c9333170f11780d8e3a70da1b1a88338.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/agg-tx.c')
| -rw-r--r-- | net/mac80211/agg-tx.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c index 96d25348aa59..87782a4bb541 100644 --- a/net/mac80211/agg-tx.c +++ b/net/mac80211/agg-tx.c @@ -184,7 +184,6 @@ static void sta_addba_resp_timer_expired(unsigned long data) HT_AGG_STATE_REQ_STOP_BA_MSK)) != HT_ADDBA_REQUESTED_MSK) { spin_unlock_bh(&sta->lock); - *state = HT_AGG_STATE_IDLE; #ifdef CONFIG_MAC80211_HT_DEBUG printk(KERN_DEBUG "timer expired on tid %d but we are not " "(or no longer) expecting addBA response there", |