Author: jimharris
Date: Wed Jun 18 19:28:55 2014
New Revision: 267619
URL: http://svnweb.freebsd.org/changeset/base/267619
Log:
MFC r267342:
Use bitwise OR instead of logical OR when constructing value for
SET_FEATURES/NUMBER_OF_QUEUES command.
Sponsored by: Intel
Approved by: re (gjb)
Modified:
stable/9/sys/dev/nvme/nvme_ctrlr_cmd.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/nvme/nvme_ctrlr_cmd.c
==============================================================================
--- stable/9/sys/dev/nvme/nvme_ctrlr_cmd.c Wed Jun 18 18:31:35 2014
(r267618)
+++ stable/9/sys/dev/nvme/nvme_ctrlr_cmd.c Wed Jun 18 19:28:55 2014
(r267619)
@@ -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);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
