diff options
author | Mohammed Shafi Shajakhan <mshajakhan@atheros.com> | 2011-05-13 11:29:42 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-05-16 14:10:48 -0400 |
commit | 108697c44b8e50bea3505c6bf9667da4627cb2d5 (patch) | |
tree | b98016826c33e5a2cc5950bccc8f84f223fb0bc9 /drivers/net | |
parent | 21e8ee6d207f6d384689571101436eb9070c22ca (diff) |
ath9k: make npending frames check as bool
we are not doing anything by tracking the number of pending frames.
bail out when we first find a pending frame in any one of the 10 queues.
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 33816091b43..45303bdbc46 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c | |||
@@ -2276,7 +2276,7 @@ static void ath9k_flush(struct ieee80211_hw *hw, bool drop) | |||
2276 | timeout = 1; | 2276 | timeout = 1; |
2277 | 2277 | ||
2278 | for (j = 0; j < timeout; j++) { | 2278 | for (j = 0; j < timeout; j++) { |
2279 | int npend = 0; | 2279 | bool npend = false; |
2280 | 2280 | ||
2281 | if (j) | 2281 | if (j) |
2282 | usleep_range(1000, 2000); | 2282 | usleep_range(1000, 2000); |
@@ -2285,7 +2285,10 @@ static void ath9k_flush(struct ieee80211_hw *hw, bool drop) | |||
2285 | if (!ATH_TXQ_SETUP(sc, i)) | 2285 | if (!ATH_TXQ_SETUP(sc, i)) |
2286 | continue; | 2286 | continue; |
2287 | 2287 | ||
2288 | npend += ath9k_has_pending_frames(sc, &sc->tx.txq[i]); | 2288 | npend = ath9k_has_pending_frames(sc, &sc->tx.txq[i]); |
2289 | |||
2290 | if (npend) | ||
2291 | break; | ||
2289 | } | 2292 | } |
2290 | 2293 | ||
2291 | if (!npend) | 2294 | if (!npend) |