diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-06-25 12:20:16 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-06-25 12:20:16 +0200 |
commit | 9277326e1e5d395397fbe20c0f310cf30bfbacc2 (patch) | |
tree | dc60601afda52bf7059d0b06781a3b2cdf26ed96 /drivers/net/wireless/ath/ath9k/rc.c | |
parent | cfb4e624314b657ea5831505a380d932f3313a7a (diff) | |
parent | 9fbdc75116f7a2b183464d42f3abccb616584105 (diff) | |
download | talos-op-linux-9277326e1e5d395397fbe20c0f310cf30bfbacc2.tar.gz talos-op-linux-9277326e1e5d395397fbe20c0f310cf30bfbacc2.zip |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/rc.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/rc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c index aa4d368d8d3d..7eb1f4b458e4 100644 --- a/drivers/net/wireless/ath/ath9k/rc.c +++ b/drivers/net/wireless/ath/ath9k/rc.c @@ -1227,10 +1227,7 @@ static bool ath_tx_aggr_check(struct ath_softc *sc, struct ieee80211_sta *sta, return false; txtid = ATH_AN_2_TID(an, tidno); - - if (!(txtid->state & (AGGR_ADDBA_COMPLETE | AGGR_ADDBA_PROGRESS))) - return true; - return false; + return !txtid->active; } |