diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-03-15 14:16:48 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-03-15 14:16:48 -0400 |
| commit | 106af2c99a5249b809aaed45b8353ac087821f4a (patch) | |
| tree | b9d13cc35cfdc3b763408287b4e50daf32fda53b /drivers/net/wireless/ath/ath5k/base.c | |
| parent | 0c0217b016ba8a970a6f6ab62ad0d858f39881ca (diff) | |
| parent | 7d2c16befae67b901e6750b845661c1fdffd19f1 (diff) | |
| download | talos-op-linux-106af2c99a5249b809aaed45b8353ac087821f4a.tar.gz talos-op-linux-106af2c99a5249b809aaed45b8353ac087821f4a.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/base.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath5k/base.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index e6ff62e60a79..4d7f21ee111c 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c @@ -943,6 +943,7 @@ ath5k_txq_setup(struct ath5k_softc *sc, spin_lock_init(&txq->lock); txq->setup = true; txq->txq_len = 0; + txq->txq_max = ATH5K_TXQ_LEN_MAX; txq->txq_poll_mark = false; txq->txq_stuck = 0; } @@ -1534,7 +1535,7 @@ ath5k_tx_queue(struct ieee80211_hw *hw, struct sk_buff *skb, goto drop_packet; } - if (txq->txq_len >= ATH5K_TXQ_LEN_MAX) + if (txq->txq_len >= txq->txq_max) ieee80211_stop_queue(hw, txq->qnum); spin_lock_irqsave(&sc->txbuflock, flags); |
