scsi: qla2xxx: Restore FAWWPN of Physical Port only for loop down

When loop was made down explicitly due to cable pull, then for N2N toplogy,
if FAWWPN BIT is enabled by user, then it would restore some default
(garbage) value for Physical port WWPN, so this show garbage WWPN for the
port. Fix is, to restore physical port WWPN, if it is fabric
configuration. When loop is explicitly made down, and FAWWPN feature is
enabled, then driver need to restore original flashed WWPN.

Signed-off-by: Sawan Chandak <schandak@marvell.com>
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 5c1de6ed825bdc29a4ccfccd627052155ed2b6b6..bde9940ea7d1f51a87280d7f0285e6d80a3bec92 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -834,7 +834,8 @@ skip_rio:
                         * Restore for Physical Port only
                         */
                        if (!vha->vp_idx) {
-                               if (ha->flags.fawwpn_enabled) {
+                               if (ha->flags.fawwpn_enabled &&
+                                   (ha->current_topology == ISP_CFG_F)) {
                                        void *wwpn = ha->init_cb->port_name;
                                        memcpy(vha->port_name, wwpn, WWN_SIZE);
                                        fc_host_port_name(vha->host) =