From: Giridhar Malavali <giridhar.malavali@qlogic.com>
Date: Wed, 11 Apr 2012 06:14:16 +0000 (+0530)
Subject: Revert "qla2xxx: Return N-port id to firmware on logout."
X-Git-Tag: v2.6.39-400.9.0~423^2~77
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7f1e20afd5b4c932024b97d7a3219fd8f47ee9fa;p=users%2Fjedix%2Flinux-maple.git

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 0d2dc41925e3..e0a7736fbf70 100644
--- 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 068c3f95002a..ae8e4595dbd7 100644
--- 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;