2 files changed, 7 insertions, 5 deletions

diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index a401e938a87a..44f202f33101 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -2156,15 +2156,17 @@ static void ibmvfc_handle_async(struct ibmvfc_async_crq *crq,
         case IBMVFC_AE_LINK_UP:
         case IBMVFC_AE_RESUME:
                 vhost->events_to_log |= IBMVFC_AE_LINKUP;
-                ibmvfc_init_host(vhost, 1);
+                vhost->delay_init = 1;
+                __ibmvfc_reset_host(vhost);
                 break;
         case IBMVFC_AE_SCN_FABRIC:
+        case IBMVFC_AE_SCN_DOMAIN:
                 vhost->events_to_log |= IBMVFC_AE_RSCN;
-                ibmvfc_init_host(vhost, 1);
+                vhost->delay_init = 1;
+                __ibmvfc_reset_host(vhost);
                 break;
         case IBMVFC_AE_SCN_NPORT:
         case IBMVFC_AE_SCN_GROUP:
-        case IBMVFC_AE_SCN_DOMAIN:
                 vhost->events_to_log |= IBMVFC_AE_RSCN;
         case IBMVFC_AE_ELS_LOGO:
         case IBMVFC_AE_ELS_PRLO:
@@ -3619,7 +3621,7 @@ static void ibmvfc_do_work(struct ibmvfc_host *vhost)
                 if (vhost->delay_init) {
                         vhost->delay_init = 0;
                         spin_unlock_irqrestore(vhost->host->host_lock, flags);
-                        ssleep(5);
+                        ssleep(15);
                         return;
                 } else
                         vhost->job_step(vhost);
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.h b/drivers/scsi/ibmvscsi/ibmvfc.h
index cf02216dc8db..babdf3db59df 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.h
+++ b/drivers/scsi/ibmvscsi/ibmvfc.h
@@ -33,7 +33,7 @@
 #define IBMVFC_DRIVER_DATE              "(November 14, 2008)"
 
 #define IBMVFC_DEFAULT_TIMEOUT  15
-#define IBMVFC_INIT_TIMEOUT             30
+#define IBMVFC_INIT_TIMEOUT             120
 #define IBMVFC_MAX_REQUESTS_DEFAULT     100
 
 #define IBMVFC_DEBUG                    0