From 80f35c1c01e53b7a73f68a3d45943dfff2115fbd Mon Sep 17 00:00:00 2001 From: Vasanthakumar Thiagarajan Date: Tue, 9 Jun 2009 15:28:21 +0530 Subject: [PATCH] --- yaml --- r: 150819 b: refs/heads/master c: 5eae6592e9bdc989151171828ee97e0ad9e1b1ac h: refs/heads/master i: 150817: 7d72fcc736c39d409dc1583a9ac851a27102a920 150815: b794079912b2dc8e6dc4eee175c92c7fb27e45cc v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/xmit.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ac1a15157d17..163d76391423 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 736708bd04b7a8941fddda32211982cab5d14431 +refs/heads/master: 5eae6592e9bdc989151171828ee97e0ad9e1b1ac diff --git a/trunk/drivers/net/wireless/ath/ath9k/xmit.c b/trunk/drivers/net/wireless/ath/ath9k/xmit.c index a8def4fa449c..b61a071788a5 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/xmit.c +++ b/trunk/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; }