[src/trunk]: src/sys/dev/ic Move mpt_disc_enable setting into is_scsi block.

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d99ea456af56
branches:  trunk
changeset: 359127:d99ea456af56
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Tue Jan 30 20:20:38 2018 +0000

description:
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.

diffstat:

 sys/dev/ic/mpt_netbsd.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (44 lines):

diff -r fbd95d2e769a -r d99ea456af56 sys/dev/ic/mpt_netbsd.c
--- a/sys/dev/ic/mpt_netbsd.c   Tue Jan 30 20:15:41 2018 +0000
+++ b/sys/dev/ic/mpt_netbsd.c   Tue Jan 30 20:20:38 2018 +0000
@@ -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 @@
 {
        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 @@
 
        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
                 */