Date: Wed, 18 Jun 2014 19:32:38 +0000 (UTC) From: Jim Harris <jimharris@FreeBSD.org> 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 Message-ID: <201406181932.s5IJWcE0024773@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406181932.s5IJWcE0024773>