From: Felix Fietkau <nbd@openwrt.org>
To: linux-wireless@vger.kernel.org
Cc: linville@tuxdriver.com, ath5k-devel@lists.ath5k.org
Subject: [PATCH 8/8] ath5k: do not call ieee80211_stop_queue for queues not managed by mac80211
Date: Mon, 4 Jul 2011 12:47:47 +0700 [thread overview]
Message-ID: <1309758467-1712-8-git-send-email-nbd@openwrt.org> (raw)
In-Reply-To: <1309758467-1712-7-git-send-email-nbd@openwrt.org>
Instead of using ieee80211_stop_queue, check the configured tx queue
limit before calling ieee80211_get_buffered_bc.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---
drivers/net/wireless/ath/ath5k/base.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index efec14f..d889f33 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -1555,7 +1555,8 @@ ath5k_tx_queue(struct ieee80211_hw *hw, struct sk_buff *skb,
goto drop_packet;
}
- if (txq->txq_len >= txq->txq_max)
+ if (txq->txq_len >= txq->txq_max &&
+ txq->qnum <= AR5K_TX_QUEUE_ID_DATA_MAX)
ieee80211_stop_queue(hw, txq->qnum);
spin_lock_irqsave(&sc->txbuflock, flags);
@@ -1931,6 +1932,10 @@ ath5k_beacon_send(struct ath5k_softc *sc)
skb = ieee80211_get_buffered_bc(sc->hw, vif);
while (skb) {
ath5k_tx_queue(sc->hw, skb, sc->cabq);
+
+ if (sc->cabq->txq_len >= sc->cabq->txq_max)
+ break;
+
skb = ieee80211_get_buffered_bc(sc->hw, vif);
}
--
1.7.3.2
next prev parent reply other threads:[~2011-07-04 6:11 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-04 5:47 [PATCH 1/8] ath5k: add missing checks for rfgain probe Felix Fietkau
2011-07-04 5:47 ` [PATCH 2/8] ath5k: apply the synth voltage tweak only on AR5112 rev 2 Felix Fietkau
2011-07-04 5:47 ` [PATCH 3/8] ath5k: fix reference clock frequency for spur mitigation on AR2413 Felix Fietkau
[not found] ` <1309758467-1712-4-git-send-email-nbd@openwrt.org>
2011-07-04 5:47 ` [PATCH 5/8] ath5k: delay full calibration after reset Felix Fietkau
2011-07-04 5:47 ` [PATCH 6/8] ath5k: fix reference clock usec duration setting restore Felix Fietkau
2011-07-04 5:47 ` [PATCH 7/8] ath5k: disable 32KHz sleep clock operation Felix Fietkau
2011-07-04 5:47 ` Felix Fietkau [this message]
2011-07-04 9:58 ` Nick Kossifidis
2011-07-04 10:07 ` Felix Fietkau
2011-07-04 10:14 ` Nick Kossifidis
2011-07-04 14:41 ` Kalle Valo
2011-07-04 21:02 ` Nick Kossifidis
2011-07-04 10:25 ` [PATCH 6/8] ath5k: fix reference clock usec duration setting restore Nick Kossifidis
2011-07-04 10:34 ` [ath5k-devel] [PATCH 5/8] ath5k: delay full calibration after reset Nick Kossifidis
2011-07-04 10:40 ` [ath5k-devel] [PATCH 4/8] ath5k: initialize common->clockrate Nick Kossifidis
2011-07-04 10:44 ` Felix Fietkau
2011-07-04 10:49 ` Nick Kossifidis
2011-07-04 10:27 ` [PATCH 3/8] ath5k: fix reference clock frequency for spur mitigation on AR2413 Nick Kossifidis
2011-07-04 10:29 ` [ath5k-devel] [PATCH 2/8] ath5k: apply the synth voltage tweak only on AR5112 rev 2 Nick Kossifidis
2011-07-04 9:48 ` [PATCH 1/8] ath5k: add missing checks for rfgain probe Nick Kossifidis
2011-07-04 9:56 ` Felix Fietkau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1309758467-1712-8-git-send-email-nbd@openwrt.org \
--to=nbd@openwrt.org \
--cc=ath5k-devel@lists.ath5k.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).