From 4f010bf95b449fc32e7640beb127a32c29118efe Mon Sep 17 00:00:00 2001
From: Vasu Dev <vasu.dev@intel.com>
Date: Fri, 9 Apr 2010 14:22:59 -0700
Subject: [PATCH] --- yaml --- r: 195644 b: refs/heads/master c:
 da87bfab8a7e6cfd0e1e5c5874d7fd4f7d11e64e h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/scsi/fcoe/fcoe.c      | 2 ++
 trunk/drivers/scsi/fnic/fnic.h      | 2 +-
 trunk/drivers/scsi/fnic/fnic_main.c | 2 +-
 trunk/include/scsi/libfcoe.h        | 2 ++
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c5f6dbe3668f..2976d3aca42a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ba00a4bbbbcb39d077e837555dfa9ff0de4202e
+refs/heads/master: da87bfab8a7e6cfd0e1e5c5874d7fd4f7d11e64e
diff --git a/trunk/drivers/scsi/fcoe/fcoe.c b/trunk/drivers/scsi/fcoe/fcoe.c
index 4d46b71849ab..25a7ce5c2d24 100644
--- a/trunk/drivers/scsi/fcoe/fcoe.c
+++ b/trunk/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/trunk/drivers/scsi/fnic/fnic.h b/trunk/drivers/scsi/fnic/fnic.h
index 585cc9cb942c..19338e0ba2c5 100644
--- a/trunk/drivers/scsi/fnic/fnic.h
+++ b/trunk/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/trunk/drivers/scsi/fnic/fnic_main.c b/trunk/drivers/scsi/fnic/fnic_main.c
index 97b212570bcc..265e73d9cd6f 100644
--- a/trunk/drivers/scsi/fnic/fnic_main.c
+++ b/trunk/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/trunk/include/scsi/libfcoe.h b/trunk/include/scsi/libfcoe.h
index 868ed26a9767..ec13f51531f8 100644
--- a/trunk/include/scsi/libfcoe.h
+++ b/trunk/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.
  */