summaryrefslogtreecommitdiff
path: root/sys/dev/ic/isp.c
diff options
context:
space:
mode:
authormjacob <mjacob@NetBSD.org>2001-02-23 05:38:27 +0000
committermjacob <mjacob@NetBSD.org>2001-02-23 05:38:27 +0000
commitbaf0985f2a37f2277a02f4e7646aec92ff5c3a76 (patch)
tree345de7bf2f8e627dae888208fdc33dcfe82dfed9 /sys/dev/ic/isp.c
parent5137cda30607cbe16cb2008535acf740d32a16da (diff)
Fix a longstanding bug- we had the sense of what bit 14
for the ICB firmware options meant- *I* had taken it to mean that if you set it, Node Name would be ignored and derived from Port Name. Actually, it meant the opposite. As a consequence- change ICBOPT_USE_PORTNAME to the define ICBOPT_BOTH_WWNS- makes more sense.
Diffstat (limited to 'sys/dev/ic/isp.c')
-rw-r--r--sys/dev/ic/isp.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/dev/ic/isp.c b/sys/dev/ic/isp.c
index de0b0c3f0e1..37b063354a8 100644
--- a/sys/dev/ic/isp.c
+++ b/sys/dev/ic/isp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isp.c,v 1.71 2001/02/20 01:10:50 mjacob Exp $ */
+/* $NetBSD: isp.c,v 1.72 2001/02/23 05:38:27 mjacob Exp $ */
/*
* This driver, which is contained in NetBSD in the files:
*
@@ -1104,11 +1104,6 @@ isp_fibre_init(isp)
*/
fcp->isp_fwoptions |= ICBOPT_PDBCHANGE_AE;
- /*
- * We don't set ICBOPT_PORTNAME because we want our
- * Node Name && Port Names to be distinct.
- */
-
/*
* Make sure that target role reflects into fwoptions.
@@ -1176,6 +1171,7 @@ isp_fibre_init(isp)
nwwn = ISP_NODEWWN(isp);
pwwn = ISP_PORTWWN(isp);
if (nwwn && pwwn) {
+ icbp->icb_fwoptions |= ICBOPT_BOTH_WWNS;
MAKE_NODE_NAME_FROM_WWN(icbp->icb_nodename, nwwn);
MAKE_NODE_NAME_FROM_WWN(icbp->icb_portname, pwwn);
isp_prt(isp, ISP_LOGDEBUG1,
@@ -1186,7 +1182,7 @@ isp_fibre_init(isp)
((u_int32_t) (pwwn & 0xffffffff)));
} else {
isp_prt(isp, ISP_LOGDEBUG1, "Not using any WWNs");
- fcp->isp_fwoptions &= ~(ICBOPT_USE_PORTNAME|ICBOPT_FULL_LOGIN);
+ icbp->icb_fwoptions &= ~(ICBOPT_BOTH_WWNS|ICBOPT_FULL_LOGIN);
}
icbp->icb_rqstqlen = RQUEST_QUEUE_LEN(isp);
icbp->icb_rsltqlen = RESULT_QUEUE_LEN(isp);