Attachment 582709 Details for Bug 817490 – Patch to fix this problem for devices with a single hardware queue

[patch] Patch to fix this problem for devices with a single hardware queue

mac80211_fix_single_queue.patch (text/plain), 3.38 KB, created by Larry Finger on 2012-05-07 16:04:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Larry Finger

Created: 2012-05-07 16:04:57 UTC

Size: 3.38 KB

patch

obsolete

>X-Account-Key: account11
>X-UIDL: GmailId13727fa1f857c8f4
>X-Mozilla-Status: 0001
>X-Mozilla-Status2: 00000000
>X-Mozilla-Keys:                                                                                 
>Delivered-To: larry.finger@gmail.com
>Received: by 10.205.37.10 with SMTP id tc10csp404414bkb;
>        Mon, 7 May 2012 08:45:33 -0700 (PDT)
>Received: by 10.236.190.138 with SMTP id e10mr23373yhn.131.1336405532874;
>        Mon, 07 May 2012 08:45:32 -0700 (PDT)
>Return-Path: <johannes@sipsolutions.net>
>Received: from mail.networksolutionsemail.com (mail.networksolutionsemail.com. [205.178.146.50])
>        by mx.google.com with SMTP id j6si1273465ani.187.2012.05.07.08.45.32;
>        Mon, 07 May 2012 08:45:32 -0700 (PDT)
>Received-SPF: neutral (google.com: 205.178.146.50 is neither permitted nor denied by best guess record for domain of johannes@sipsolutions.net) client-ip=205.178.146.50;
>Authentication-Results: mx.google.com; spf=neutral (google.com: 205.178.146.50 is neither permitted nor denied by best guess record for domain of johannes@sipsolutions.net) smtp.mail=johannes@sipsolutions.net
>Received: (qmail 6403 invoked by uid 78); 7 May 2012 15:45:31 -0000
>Delivered-To: lwfinger.net-Larry.Finger@lwfinger.net
>Received: (qmail 6377 invoked by uid 78); 7 May 2012 15:45:31 -0000
>Received: from unknown (HELO cm-mr29) (10.49.16.117)
>  by 0 with SMTP; 7 May 2012 15:45:31 -0000
>Return-Path: <johannes@sipsolutions.net>
>Received: from [78.46.109.217] ([78.46.109.217:38333] helo=sipsolutions.net)
>	by cm-mr29 (envelope-from <johannes@sipsolutions.net>)
>	(ecelerity 2.2.3.46 r(37554)) with ESMTP
>	id 25/32-26585-B1EE7AF4; Mon, 07 May 2012 11:45:31 -0400
>Received: by sipsolutions.net with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32)
>	(Exim 4.77)
>	(envelope-from <johannes@sipsolutions.net>)
>	id 1SRQ7t-0003Ap-7q; Mon, 07 May 2012 17:45:29 +0200
>Message-ID: <1336405529.4325.31.camel@jlt3.sipsolutions.net>
>Subject: [PATCH] mac80211: fix single queue drivers
>From: Johannes Berg <johannes@sipsolutions.net>
>To: John Linville <linville@tuxdriver.com>
>Cc: Larry Finger <Larry.Finger@lwfinger.net>, linux-wireless
>	 <linux-wireless@vger.kernel.org>
>Date: Mon, 07 May 2012 17:45:29 +0200
>Content-Type: text/plain; charset="UTF-8"
>X-Mailer: Evolution 3.2.2-1 
>Content-Transfer-Encoding: 7bit
>Mime-Version: 1.0
>
>From: Johannes Berg <johannes.berg@intel.com>
>
>My queue management rework broke drivers that don't
>have multiple AC queues and register a single queue
>only, causing a warning:
>
>WARNING: at net/mac80211/iface.c:162 ieee80211_check_queues
>
>This was due to filling the queues wrongly and then
>noticing the error when checking later.
>
>Reported-and-Tested-by: Larry Finger <Larry.Finger@lwfinger.net>
>Signed-off-by: Johannes Berg <johannes.berg@intel.com>
>---
> net/mac80211/iface.c |    4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>--- a/net/mac80211/iface.c	2012-05-03 21:56:23.000000000 +0200
>+++ b/net/mac80211/iface.c	2012-05-07 17:43:21.000000000 +0200
>@@ -206,8 +206,10 @@ static void ieee80211_set_default_queues
> 	for (i = 0; i < IEEE80211_NUM_ACS; i++) {
> 		if (local->hw.flags & IEEE80211_HW_QUEUE_CONTROL)
> 			sdata->vif.hw_queue[i] = IEEE80211_INVAL_HW_QUEUE;
>-		else
>+		else if (local->hw.queues >= IEEE80211_NUM_ACS)
> 			sdata->vif.hw_queue[i] = i;
>+		else
>+			sdata->vif.hw_queue[i] = 0;
> 	}
> 	sdata->vif.cab_queue = IEEE80211_INVAL_HW_QUEUE;
> }
>
>
>

Actions: View | Diff

Attachments on bug 817490: 582709