From owner-svn-src-stable-10@FreeBSD.ORG  Wed Jun 18 19:32:38 2014
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CE8C2A89;
 Wed, 18 Jun 2014 19:32:38 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 BBD71286B;
 Wed, 18 Jun 2014 19:32:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5IJWc1G024774;
 Wed, 18 Jun 2014 19:32:38 GMT
 (envelope-from jimharris@svn.freebsd.org)
Received: (from jimharris@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5IJWcE0024773;
 Wed, 18 Jun 2014 19:32:38 GMT
 (envelope-from jimharris@svn.freebsd.org)
Message-Id: <201406181932.s5IJWcE0024773@svn.freebsd.org>
From: Jim Harris <jimharris@FreeBSD.org>
Date: Wed, 18 Jun 2014 19:32:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r267620 - stable/10/sys/dev/nvme
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Jun 2014 19:32:38 -0000

Author: jimharris
Date: Wed Jun 18 19:32:38 2014
New Revision: 267620
URL: http://svnweb.freebsd.org/changeset/base/267620

Log:
  MFC r267342:
  
    Use bitwise OR instead of logical OR when constructing value for
    SET_FEATURES/NUMBER_OF_QUEUES command.
  
  Sponsored by:	Intel

Modified:
  stable/10/sys/dev/nvme/nvme_ctrlr_cmd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/nvme/nvme_ctrlr_cmd.c
==============================================================================
--- stable/10/sys/dev/nvme/nvme_ctrlr_cmd.c	Wed Jun 18 19:28:55 2014	(r267619)
+++ stable/10/sys/dev/nvme/nvme_ctrlr_cmd.c	Wed Jun 18 19:32:38 2014	(r267620)
@@ -205,7 +205,7 @@ nvme_ctrlr_cmd_set_num_queues(struct nvm
 {
 	uint32_t cdw11;
 
-	cdw11 = ((num_queues - 1) << 16) || (num_queues - 1);
+	cdw11 = ((num_queues - 1) << 16) | (num_queues - 1);
 	nvme_ctrlr_cmd_set_feature(ctrlr, NVME_FEAT_NUMBER_OF_QUEUES, cdw11,
 	    NULL, 0, cb_fn, cb_arg);
 }