From fd6eb9f769296a0aa8ca3bc8bb5b06505c48da4c Mon Sep 17 00:00:00 2001 From: Matt Jacob Date: Sat, 13 Sep 2003 01:56:24 +0000 Subject: [PATCH] Report correct active vs. nvram node/port WWNs in an ioctl. --- sys/dev/isp/isp_freebsd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c index 47bfec933bf0..954390856a69 100644 --- a/sys/dev/isp/isp_freebsd.c +++ b/sys/dev/isp/isp_freebsd.c @@ -399,8 +399,10 @@ ispioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct thread *td) hba->fc_scsi_supported = 1; hba->fc_topology = FCPARAM(isp)->isp_topo + 1; hba->fc_loopid = FCPARAM(isp)->isp_loopid; - hba->active_node_wwn = FCPARAM(isp)->isp_nodewwn; - hba->active_port_wwn = FCPARAM(isp)->isp_portwwn; + hba->nvram_node_wwn = FCPARAM(isp)->isp_nodewwn; + hba->nvram_port_wwn = FCPARAM(isp)->isp_portwwn; + hba->active_node_wwn = ISP_NODEWWN(isp); + hba->active_port_wwn = ISP_PORTWWN(isp); ISP_UNLOCK(isp); retval = 0; break;