From owner-svn-src-all@freebsd.org  Thu Dec 10 07:45:59 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A62819D67A7;
 Thu, 10 Dec 2015 07:45:59 +0000 (UTC)
 (envelope-from kevlo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 74AE61CE4;
 Thu, 10 Dec 2015 07:45:59 +0000 (UTC)
 (envelope-from kevlo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBA7jwPs014567;
 Thu, 10 Dec 2015 07:45:58 GMT (envelope-from kevlo@FreeBSD.org)
Received: (from kevlo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBA7jw6U014566;
 Thu, 10 Dec 2015 07:45:58 GMT (envelope-from kevlo@FreeBSD.org)
Message-Id: <201512100745.tBA7jw6U014566@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevlo set sender to
 kevlo@FreeBSD.org using -f
From: Kevin Lo <kevlo@FreeBSD.org>
Date: Thu, 10 Dec 2015 07:45:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r292056 - head/sys/dev/usb/wlan
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Dec 2015 07:45:59 -0000

Author: kevlo
Date: Thu Dec 10 07:45:58 2015
New Revision: 292056
URL: https://svnweb.freebsd.org/changeset/base/292056

Log:
  All 2-endpoints configs have high and normal pariority queues.

Modified:
  head/sys/dev/usb/wlan/if_urtwn.c

Modified: head/sys/dev/usb/wlan/if_urtwn.c
==============================================================================
--- head/sys/dev/usb/wlan/if_urtwn.c	Thu Dec 10 07:42:56 2015	(r292055)
+++ head/sys/dev/usb/wlan/if_urtwn.c	Thu Dec 10 07:45:58 2015	(r292056)
@@ -2935,13 +2935,11 @@ urtwn_dma_init(struct urtwn_softc *sc)
 		else
 			reg |= R92C_TRXDMA_CTRL_QMAP_LQ;
 	} else if (nqueues == 2) {
-		/* All 2-endpoints configs have a high priority queue. */
-		if (!hashq)
-			return (EIO);
-		if (hasnq)
-			reg |= R92C_TRXDMA_CTRL_QMAP_HQ_NQ;
-		else
-			reg |= R92C_TRXDMA_CTRL_QMAP_HQ_LQ;
+		/* 
+		 * All 2-endpoints configs have high and normal 
+		 * priority queues.
+		 */
+		reg |= R92C_TRXDMA_CTRL_QMAP_HQ_NQ;
 	} else
 		reg |= R92C_TRXDMA_CTRL_QMAP_3EP;
 	usb_err = urtwn_write_2(sc, R92C_TRXDMA_CTRL, reg);