From e7d7092499c048dac039692bd85bcc1a9680b19e Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@gmail.com>
Date: Tue, 23 Jun 2009 01:06:40 +0200
Subject: [PATCH] --- yaml --- r: 154799 b: refs/heads/master c:
 87a2d34b0372dcf6bc4caf4d97a7889f5e62a1af h: refs/heads/master i:   154797:
 0e25ced7df1263da231f64db862e842857c4ee9e   154795:
 75a7353e0ad8f83192b710979e925c6964700ade   154791:
 e22719659bf3951528822a6850640887ce8c0f58   154783:
 3e86c75a96d1650f642969e0570eb4e251ffb8a5 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/scsi/fnic/fnic_scsi.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 3cf26b88360c..a240f8ebf0df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e08afeb7e69f45e4ab9fbb8530fe433484b96606
+refs/heads/master: 87a2d34b0372dcf6bc4caf4d97a7889f5e62a1af
diff --git a/trunk/drivers/scsi/fnic/fnic_scsi.c b/trunk/drivers/scsi/fnic/fnic_scsi.c
index eabf36502856..bfc996971b81 100644
--- a/trunk/drivers/scsi/fnic/fnic_scsi.c
+++ b/trunk/drivers/scsi/fnic/fnic_scsi.c
@@ -245,7 +245,7 @@ static inline int fnic_queue_wq_copy_desc(struct fnic *fnic,
 					  struct vnic_wq_copy *wq,
 					  struct fnic_io_req *io_req,
 					  struct scsi_cmnd *sc,
-					  u32 sg_count)
+					  int sg_count)
 {
 	struct scatterlist *sg;
 	struct fc_rport *rport = starget_to_rport(scsi_target(sc->device));
@@ -260,9 +260,6 @@ static inline int fnic_queue_wq_copy_desc(struct fnic *fnic,
 	char msg[2];
 
 	if (sg_count) {
-		BUG_ON(sg_count < 0);
-		BUG_ON(sg_count > FNIC_MAX_SG_DESC_CNT);
-
 		/* For each SGE, create a device desc entry */
 		desc = io_req->sgl_list;
 		for_each_sg(scsi_sglist(sc), sg, sg_count, i) {
@@ -344,7 +341,7 @@ int fnic_queuecommand(struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *))
 	struct fnic *fnic;
 	struct vnic_wq_copy *wq;
 	int ret;
-	u32 sg_count;
+	int sg_count;
 	unsigned long flags;
 	unsigned long ptr;