Revert "qla2xxx: Return N-port id to firmware on logout."

This reverts commit b6c09482a0c1f7aaa3f84fb83908f131ae7a3736.

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 0d2dc41925e3620ca31012d7746263d3ad34c63f..e0a7736fbf703d385d3e1831b98a6a20c39260b3 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -391,7 +391,6 @@ qla2x00_async_logout_done(struct scsi_qla_host *vha, fc_port_t *fcport,
     uint16_t *data)
 {
        qla2x00_mark_device_lost(vha, fcport, 1, 0);
-       fcport->loop_id = FC_NO_LOOP_ID;
        return;
 }
 

diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index 068c3f95002a0e0b7b2ae49cfc697c58e372db51..ae8e4595dbd752236fd180a86cd8005feb19b35a 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -1931,7 +1931,7 @@ qla24xx_logout_iocb(srb_t *sp, struct logio_entry_24xx *logio)
 {
        logio->entry_type = LOGINOUT_PORT_IOCB_TYPE;
        logio->control_flags =
-           cpu_to_le16(LCF_COMMAND_LOGO|LCF_IMPL_LOGO|LCF_FREE_NPORT);
+           cpu_to_le16(LCF_COMMAND_LOGO|LCF_IMPL_LOGO);
        logio->nport_handle = cpu_to_le16(sp->fcport->loop_id);
        logio->port_id[0] = sp->fcport->d_id.b.al_pa;
        logio->port_id[1] = sp->fcport->d_id.b.area;