commit: cefcaba67ab97fb756b3a6af5139c94d861b660d
From: Saurav Kashyap <[email protected]>
Date: Tue, 10 May 2011 11:18:18 -0700
Subject: [PATCH] [SCSI] qla2xxx: Fix virtual port failing to login after chip
 reset.

This patch ensures qla82xx_watchdog is not being run for the vport. It also
makes sure that beacon ON is not done for the vport, as it will lead to the
waking up of the dpc thread again and again.

Signed-off-by: Saurav Kashyap <[email protected]>
Signed-off-by: Madhuranath Iyengar <[email protected]>
Cc: [email protected]
Signed-off-by: James Bottomley <[email protected]>
Signed-off-by: James Bottomley <[email protected]>
---
 drivers/scsi/qla2xxx/qla_os.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 0ca6664..7168e7f 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -3623,7 +3623,8 @@ qla2x00_timer(scsi_qla_host_t *vha)
        if (!pci_channel_offline(ha->pdev))
                pci_read_config_word(ha->pdev, PCI_VENDOR_ID, &w);
 
-       if (IS_QLA82XX(ha)) {
+       /* Make sure qla82xx_watchdog is run only for physical port */
+       if (!vha->vp_idx && IS_QLA82XX(ha)) {
                if (test_bit(ISP_QUIESCE_NEEDED, &vha->dpc_flags))
                        start_dpc++;
                qla82xx_watchdog(vha);
@@ -3704,8 +3705,8 @@ qla2x00_timer(scsi_qla_host_t *vha)
                    atomic_read(&vha->loop_down_timer)));
        }
 
-       /* Check if beacon LED needs to be blinked */
-       if (ha->beacon_blink_led == 1) {
+       /* Check if beacon LED needs to be blinked for physical host only */
+       if (!vha->vp_idx && (ha->beacon_blink_led == 1)) {
                set_bit(BEACON_BLINK_NEEDED, &vha->dpc_flags);
                start_dpc++;
        }

_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to