From d9ebb3927f86805368a53e56396b92a8b1098af7 Mon Sep 17 00:00:00 2001
From: Mike Christie <michaelc@cs.wisc.edu>
Date: Tue, 26 Feb 2008 12:35:23 -0600
Subject: [PATCH] --- yaml --- r: 86951 b: refs/heads/master c:
 31ed0bf439a15363c28c7a239f52eb127cb6feb3 h: refs/heads/master i:   86949:
 31acce63410e05da7639a58dcfd03e1611af7b37   86947:
 47243e69ca3fda9bd4534c8e6ced0b9765ca2f80   86943:
 9fa4ae74531a8e7eb2b7ab657efb3b0421898ef4 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/scsi/libiscsi.c             | 4 ++--
 trunk/drivers/scsi/scsi_transport_iscsi.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f79e670ec7db..09b76a746f07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2396f1e4ecd438a15fa653a028b93e95013caa3
+refs/heads/master: 31ed0bf439a15363c28c7a239f52eb127cb6feb3
diff --git a/trunk/drivers/scsi/libiscsi.c b/trunk/drivers/scsi/libiscsi.c
index 59f8445eab0d..bdd7de7da39a 100644
--- a/trunk/drivers/scsi/libiscsi.c
+++ b/trunk/drivers/scsi/libiscsi.c
@@ -1708,8 +1708,8 @@ iscsi_session_setup(struct iscsi_transport *iscsit,
 		qdepth = ISCSI_DEF_CMD_PER_LUN;
 	}
 
-	if (!is_power_of_2(cmds_max) ||
-	    cmds_max >= ISCSI_MGMT_ITT_OFFSET) {
+	if (!is_power_of_2(cmds_max) || cmds_max >= ISCSI_MGMT_ITT_OFFSET ||
+	    cmds_max < 2) {
 		if (cmds_max != 0)
 			printk(KERN_ERR "iscsi: invalid can_queue of %d. "
 			       "can_queue must be a power of 2 and between "
diff --git a/trunk/drivers/scsi/scsi_transport_iscsi.c b/trunk/drivers/scsi/scsi_transport_iscsi.c
index 9981682d5302..dfb026b95a6a 100644
--- a/trunk/drivers/scsi/scsi_transport_iscsi.c
+++ b/trunk/drivers/scsi/scsi_transport_iscsi.c
@@ -33,7 +33,7 @@
 #define ISCSI_SESSION_ATTRS 19
 #define ISCSI_CONN_ATTRS 13
 #define ISCSI_HOST_ATTRS 4
-#define ISCSI_TRANSPORT_VERSION "2.0-868"
+#define ISCSI_TRANSPORT_VERSION "2.0-869"
 
 struct iscsi_internal {
 	int daemon_pid;