diff options
| author | Chad Dupuis <chad.dupuis@qlogic.com> | 2010-10-15 22:27:40 +0400 | 
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-10-26 00:58:28 +0400 | 
| commit | 4da26e162b69d89c3186a35a052c05e61a555637 (patch) | |
| tree | 455654208f7012cb093f6d6a2344d42d1ab19941 | |
| parent | 1e6d0670921ea4e736b172e9a3c32a2ba0c33f6a (diff) | |
| download | linux-4da26e162b69d89c3186a35a052c05e61a555637.tar.xz | |
[SCSI] qla2xxx: Add module parameter to enable/disable GFF_ID device type check.
Add the module parameter ql2xgffidenable to disable/enable the use of the
GFF_ID name server command to prevent non FCP SCSI devices from being added to
the driver's internal fc_port database.
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_gbl.h | 1 | ||||
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 5 | ||||
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 5 | 
3 files changed, 9 insertions, 2 deletions
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h index c33dec827e1e..9382a816c133 100644 --- a/drivers/scsi/qla2xxx/qla_gbl.h +++ b/drivers/scsi/qla2xxx/qla_gbl.h @@ -92,6 +92,7 @@ extern int ql2xshiftctondsd;  extern int ql2xdbwr;  extern int ql2xdontresethba;  extern int ql2xasynctmfenable; +extern int ql2xgffidenable;  extern int ql2xenabledif;  extern int ql2xenablehba_err_chk;  extern int ql2xtargetreset; diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 8c486609244c..6ea537636b53 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -3284,8 +3284,9 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha,  			continue;  		/* Bypass ports whose FCP-4 type is not FCP_SCSI */ -		if (new_fcport->fc4_type != FC4_TYPE_FCP_SCSI && -		    new_fcport->fc4_type != FC4_TYPE_UNKNOWN) +		if (ql2xgffidenable && +		    (new_fcport->fc4_type != FC4_TYPE_FCP_SCSI && +		    new_fcport->fc4_type != FC4_TYPE_UNKNOWN))  			continue;  		/* Locate matching device in database. */ diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index efbb8e7ba568..65040a584109 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -160,6 +160,11 @@ MODULE_PARM_DESC(ql2xtargetreset,  		 "Enable target reset."  		 "Default is 1 - use hw defaults."); +int ql2xgffidenable; +module_param(ql2xgffidenable, int, S_IRUGO|S_IRUSR); +MODULE_PARM_DESC(ql2xgffidenable, +		"Enables GFF_ID checks of port type. " +		"Default is 0 - Do not use GFF_ID information.");  int ql2xasynctmfenable;  module_param(ql2xasynctmfenable, int, S_IRUGO|S_IRUSR);  | 
