---

yaml --- r: 204139 b: refs/heads/master c: dd5fd33 h: refs/heads/master i: 204137: 86458d6 204135: 3014b9c v: v3
git-mirror · Jul 27, 2010 · db44761 · db44761
1 parent 0260d43
commit db44761
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d274213a1ae59e8abde8d43e1e3a478fe9f28794
+refs/heads/master: dd5fd3323abcb799d4d81f3c4b3e2a5fcbfce7bf
diff --git a/trunk/drivers/scsi/mpt2sas/mpt2sas_base.c b/trunk/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -95,6 +95,10 @@ int mpt2sas_fwfault_debug;
 MODULE_PARM_DESC(mpt2sas_fwfault_debug, " enable detection of firmware fault "
     "and halt firmware - (default=0)");
 
+static int disable_discovery = -1;
+module_param(disable_discovery, int, 0);
+MODULE_PARM_DESC(disable_discovery, " disable discovery ");
+
 /**
  * _scsih_set_fwfault_debug - global setting of ioc->fwfault_debug.
  *
@@ -3520,6 +3524,9 @@ _base_make_ioc_operational(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)
 	if (sleep_flag == CAN_SLEEP)
 		_base_static_config_pages(ioc);
 
+	if (ioc->wait_for_port_enable_to_complete && disable_discovery > 0)
+		return r;
+
 	r = _base_send_port_enable(ioc, sleep_flag);
 	if (r)
 		return r;