From patchwork Mon Apr 18 13:26:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivo van Doorn X-Patchwork-Id: 715181 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3IDZfOt000622 for ; Mon, 18 Apr 2011 13:35:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753612Ab1DRNfj (ORCPT ); Mon, 18 Apr 2011 09:35:39 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:53097 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751678Ab1DRNfi (ORCPT ); Mon, 18 Apr 2011 09:35:38 -0400 Received: by mail-fx0-f46.google.com with SMTP id 17so2833789fxm.19 for ; Mon, 18 Apr 2011 06:35:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:subject:date:user-agent:cc:references :in-reply-to:mime-version:content-type:content-transfer-encoding :message-id; bh=33IBzU/xT+j5wo8b/8NlGsSbIHX9m04ibIxGmg2AGnU=; b=CKGm73WZ46dxQJb+biVVSKKHeqTa2aKCdfnw96WFaz6uYLUwbS4xNg5YEuerhKo1G7 Hs7EAVxHP1nmoVOlMWTOXt6pwqAXEYN06Lb3hfadtv14PR/Lz/UZ+dDd3a1qZz1NjhW+ 0wSH+a2UPaQ2pK7qcQqikT3xb9FtJOVsyghQ8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:references:in-reply-to :mime-version:content-type:content-transfer-encoding:message-id; b=EKh2Ln9yYv/sqY7Q8EpkQrdrdrS1kRr0O1DjSw1iYu3kJtNjCzSyhsWnbEZDe/JLhF ioVpONIuA5GD0eSNi1nNLSjUxYK+E3qlLLHfa6OHCE6qsd8mll232W8MZKGpe6pJFUXp SMaJyyTW5U/5HmQ/BxcDancBRJXq1434oDETs= Received: by 10.223.161.194 with SMTP id s2mr4908689fax.143.1303133737961; Mon, 18 Apr 2011 06:35:37 -0700 (PDT) Received: from localhost.localdomain (g121037.upc-g.chello.nl [80.57.121.37]) by mx.google.com with ESMTPS id c21sm1673551fac.46.2011.04.18.06.35.31 (version=SSLv3 cipher=OTHER); Mon, 18 Apr 2011 06:35:36 -0700 (PDT) From: Ivo van Doorn To: "John W. Linville" Subject: [PATCH 02/23] rt2x00: Fix stuck queue in tx failure case Date: Mon, 18 Apr 2011 15:26:37 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.32.26-175.fc12.x86_64; KDE/4.4.5; x86_64; ; ) Cc: linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com References: <201104181526.01722.IvDoorn@gmail.com> In-Reply-To: <201104181526.01722.IvDoorn@gmail.com> MIME-Version: 1.0 Message-Id: <201104181526.37747.IvDoorn@gmail.com> 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 (demeter1.kernel.org [140.211.167.41]); Mon, 18 Apr 2011 13:35:41 +0000 (UTC) From: Helmut Schaa Since commit 0b7fde54f94979edc67bbf86b5adba702ebfefe8 "rt2x00: Protect queue control with mutex" rt2x00 used rt2x00queue_pause_queue for stopping a tx queue in mac80211. But in case of a failure in the tx path rt2x00 still called ieee80211_stop_queue which stopped the queue but prevented rt2x00queue_unpause_queue to wake the queue up again resulting in a stuck tx queue. Fix this by also using rt2x00queue_pause_queue in case of tx failures. Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn --- drivers/net/wireless/rt2x00/rt2x00mac.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c index 661c6ba..4a1c41b 100644 --- a/drivers/net/wireless/rt2x00/rt2x00mac.c +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c @@ -158,7 +158,7 @@ void rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) return; exit_fail: - ieee80211_stop_queue(rt2x00dev->hw, qid); + rt2x00queue_pause_queue(queue); dev_kfree_skb_any(skb); } EXPORT_SYMBOL_GPL(rt2x00mac_tx);