From patchwork Mon Jul 4 05:47:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Fietkau X-Patchwork-Id: 941582 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p646BIQ7025855 for ; Mon, 4 Jul 2011 06:11:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755115Ab1GDGLG (ORCPT ); Mon, 4 Jul 2011 02:11:06 -0400 Received: from linknet-ip-202.77.119.130.link.net.id ([202.77.119.130]:59114 "EHLO ppac-jak-id-1.inter-touch.net" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1754960Ab1GDGLE (ORCPT ); Mon, 4 Jul 2011 02:11:04 -0400 Received: from nf.lan (unknown [10.5.54.239]) by ppac-jak-id-1.inter-touch.net (Postfix) with ESMTP id 73D4263CFE; Mon, 4 Jul 2011 12:47:56 +0700 (WIT) Received: by nf.lan (Postfix, from userid 501) id 631F24D8A7FF; Mon, 4 Jul 2011 12:47:48 +0700 (WIT) From: Felix Fietkau To: linux-wireless@vger.kernel.org Cc: linville@tuxdriver.com, ath5k-devel@venema.h4ckr.net 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 Message-Id: <1309758467-1712-8-git-send-email-nbd@openwrt.org> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1309758467-1712-7-git-send-email-nbd@openwrt.org> References: <1309758467-1712-1-git-send-email-nbd@openwrt.org> <1309758467-1712-2-git-send-email-nbd@openwrt.org> <1309758467-1712-3-git-send-email-nbd@openwrt.org> <1309758467-1712-4-git-send-email-nbd@openwrt.org> <1309758467-1712-5-git-send-email-nbd@openwrt.org> <1309758467-1712-6-git-send-email-nbd@openwrt.org> <1309758467-1712-7-git-send-email-nbd@openwrt.org> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 04 Jul 2011 06:11:19 +0000 (UTC) Instead of using ieee80211_stop_queue, check the configured tx queue limit before calling ieee80211_get_buffered_bc. Signed-off-by: Felix Fietkau --- 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); }