From a8e6d273b41b233e136e059d4d7788a3f18d5074 Mon Sep 17 00:00:00 2001 From: jmatthew Date: Wed, 21 May 2014 23:01:43 +0000 Subject: [PATCH] We only have one possible location to use for a logged in port, so only set it in one place. --- sys/dev/ic/qla.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/dev/ic/qla.c b/sys/dev/ic/qla.c index 6a9bbe94a78..19476e41098 100644 --- a/sys/dev/ic/qla.c +++ b/sys/dev/ic/qla.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qla.c,v 1.40 2014/05/17 11:51:21 jmatthew Exp $ */ +/* $OpenBSD: qla.c,v 1.41 2014/05/21 23:01:43 jmatthew Exp $ */ /* * Copyright (c) 2011 David Gwynne @@ -374,7 +374,6 @@ qla_add_logged_in_port(struct qla_softc *sc, int loopid, u_int32_t portid) struct qla_fc_port *port; struct qla_get_port_db *pdb; u_int64_t node_name, port_name; - u_int32_t location; int flags, ret; ret = qla_get_port_db(sc, loopid, sc->sc_scratch); @@ -383,13 +382,11 @@ qla_add_logged_in_port(struct qla_softc *sc, int loopid, u_int32_t portid) /* put in a fake port to prevent use of this loop id */ printf("%s: loop id %d used, but can't see what's using it\n", DEVNAME(sc), loopid); - location = QLA_LOCATION_PORT_ID(portid); node_name = 0; port_name = 0; flags = 0; } else { pdb = QLA_DMA_KVA(sc->sc_scratch); - location = QLA_LOCATION_PORT_ID(portid); node_name = betoh64(pdb->node_name); port_name = betoh64(pdb->port_name); flags = 0; @@ -416,7 +413,7 @@ qla_add_logged_in_port(struct qla_softc *sc, int loopid, u_int32_t portid) DEVNAME(sc)); return (1); } - port->location = location; + port->location = QLA_LOCATION_PORT_ID(portid); port->port_name = port_name; port->node_name = node_name; port->loopid = loopid; -- 2.20.1