Module Name: src
Committed By: jakllsch
Date: Tue Jan 30 20:20:38 UTC 2018
Modified Files:
src/sys/dev/ic: mpt_netbsd.c
Log Message:
Move mpt_disc_enable setting into is_scsi block.
The field is only 16 bits, and is only refered to in the is_scsi case.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/ic/mpt_netbsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/mpt_netbsd.c
diff -u src/sys/dev/ic/mpt_netbsd.c:1.33 src/sys/dev/ic/mpt_netbsd.c:1.34
--- src/sys/dev/ic/mpt_netbsd.c:1.33 Mon May 2 19:18:29 2016
+++ src/sys/dev/ic/mpt_netbsd.c Tue Jan 30 20:20:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mpt_netbsd.c,v 1.33 2016/05/02 19:18:29 christos Exp $ */
+/* $NetBSD: mpt_netbsd.c,v 1.34 2018/01/30 20:20:38 jakllsch Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpt_netbsd.c,v 1.33 2016/05/02 19:18:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpt_netbsd.c,v 1.34 2018/01/30 20:20:38 jakllsch Exp $");
#include "bio.h"
@@ -1121,12 +1121,6 @@ mpt_set_xfer_mode(mpt_softc_t *mpt, stru
{
fCONFIG_PAGE_SCSI_DEVICE_1 tmp;
- /*
- * Always allow disconnect; we don't have a way to disable
- * it right now, in any case.
- */
- mpt->mpt_disc_enable |= (1 << xm->xm_target);
-
if (xm->xm_mode & PERIPH_CAP_TQING)
mpt->mpt_tag_enable |= (1 << xm->xm_target);
else
@@ -1134,6 +1128,12 @@ mpt_set_xfer_mode(mpt_softc_t *mpt, stru
if (mpt->is_scsi) {
/*
+ * Always allow disconnect; we don't have a way to disable
+ * it right now, in any case.
+ */
+ mpt->mpt_disc_enable |= (1 << xm->xm_target);
+
+ /*
* SCSI transport settings only make any sense for
* SCSI
*/
