diff options
| author | Vasu Dev <vasu.dev@intel.com> | 2010-04-09 14:22:59 -0700 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-04-11 14:02:39 -0500 |
| commit | da87bfab8a7e6cfd0e1e5c5874d7fd4f7d11e64e (patch) | |
| tree | 82dbf057ac960b017bc2a477f941de7f9d75c373 | |
| parent | 8ba00a4bbbbcb39d077e837555dfa9ff0de4202e (diff) | |
| download | linux-3.10-da87bfab8a7e6cfd0e1e5c5874d7fd4f7d11e64e.tar.gz linux-3.10-da87bfab8a7e6cfd0e1e5c5874d7fd4f7d11e64e.tar.bz2 linux-3.10-da87bfab8a7e6cfd0e1e5c5874d7fd4f7d11e64e.zip | |
[SCSI] fcoe, fnic, libfc: increased CDB size to 16 bytes for fcoe.
No reason to restrict CDB size to 12 bytes in fcoe, so
increased to 16 so that 16 bytes SCSI CDB doesn't fail.
Uses common define to set max_cmd_len for fcoe and fnic,
fnic is already setting max_cmd_len to 16.
sg_readcap -l fails without this fix.
Signed-off-by: Vasu Dev <vasu.dev@intel.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
| -rw-r--r-- | drivers/scsi/fcoe/fcoe.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/fnic/fnic.h | 2 | ||||
| -rw-r--r-- | drivers/scsi/fnic/fnic_main.c | 2 | ||||
| -rw-r--r-- | include/scsi/libfcoe.h | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c index 4d46b71849a..25a7ce5c2d2 100644 --- a/drivers/scsi/fcoe/fcoe.c +++ b/drivers/scsi/fcoe/fcoe.c @@ -669,6 +669,8 @@ static int fcoe_shost_config(struct fc_lport *lport, struct device *dev) lport->host->max_lun = FCOE_MAX_LUN; lport->host->max_id = FCOE_MAX_FCP_TARGET; lport->host->max_channel = 0; + lport->host->max_cmd_len = FCOE_MAX_CMD_LEN; + if (lport->vport) lport->host->transportt = fcoe_vport_transport_template; else diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h index 585cc9cb942..19338e0ba2c 100644 --- a/drivers/scsi/fnic/fnic.h +++ b/drivers/scsi/fnic/fnic.h @@ -45,7 +45,7 @@ #define FNIC_IO_LOCKS 64 /* IO locks: power of 2 */ #define FNIC_DFLT_QUEUE_DEPTH 32 #define FNIC_STATS_RATE_LIMIT 4 /* limit rate at which stats are pulled up */ -#define FNIC_MAX_CMD_LEN 16 /* Supported CDB length */ + /* * Tag bits used for special requests. */ diff --git a/drivers/scsi/fnic/fnic_main.c b/drivers/scsi/fnic/fnic_main.c index 97b212570bc..265e73d9cd6 100644 --- a/drivers/scsi/fnic/fnic_main.c +++ b/drivers/scsi/fnic/fnic_main.c @@ -556,7 +556,7 @@ static int __devinit fnic_probe(struct pci_dev *pdev, } host->max_lun = fnic->config.luns_per_tgt; host->max_id = FNIC_MAX_FCP_TARGET; - host->max_cmd_len = FNIC_MAX_CMD_LEN; + host->max_cmd_len = FCOE_MAX_CMD_LEN; fnic_get_res_counts(fnic); diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h index 868ed26a976..ec13f51531f 100644 --- a/include/scsi/libfcoe.h +++ b/include/scsi/libfcoe.h @@ -29,6 +29,8 @@ #include <scsi/fc/fc_fcoe.h> #include <scsi/libfc.h> +#define FCOE_MAX_CMD_LEN 16 /* Supported CDB length */ + /* * FIP tunable parameters. */ |