diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-10 23:41:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-10 23:41:43 -0700 |
| commit | 84503ddd65e804ccdeedee3f307b40d80ff793e6 (patch) | |
| tree | c7b805f441b1d8cb2e86b8411cf2302ff46186b4 /drivers/net/wireless/ath/ath9k/xmit.c | |
| parent | 51611a120e8120290152edd7d0020d22a7f4b4a3 (diff) | |
| parent | 2f0accc13520b2644b85f80aedce10d10d88b0ca (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/xmit.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/xmit.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index a8def4fa449..b61a071788a 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -711,6 +711,7 @@ int ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid) return 0; if (!(txtid->state & AGGR_ADDBA_COMPLETE)) { + txtid->state &= ~AGGR_ADDBA_PROGRESS; txtid->addba_exchangeattempts = 0; return 0; } |