From 533f32e0446994b1031591ba38e22ff5a21a3cf6 Mon Sep 17 00:00:00 2001
From: Mike Christie <michaelc@cs.wisc.edu>
Date: Thu, 31 Aug 2006 18:09:31 -0400
Subject: [PATCH] --- yaml --- r: 35023 b: refs/heads/master c:
 db98ccde0881b8247acb52dece6d94ed770a7aa5 h: refs/heads/master i:   35021:
 495e23cabed6c7b47777905c458b3bf98d2dd403   35019:
 dc10597d8f29f366de42e5e1f6692689069bd020   35015:
 c92726a9270127596bca7f38b8ce70c0a78f89c1   35007:
 dbb6ba9922cf1b83096457c637dc49ffe3c84b3a v: v3

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

diff --git a/[refs] b/[refs]
index 3ce102a0b491..9a246869b26a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5390f5f788f01788e9dfd41ad516a2908901610
+refs/heads/master: db98ccde0881b8247acb52dece6d94ed770a7aa5
diff --git a/trunk/drivers/scsi/libiscsi.c b/trunk/drivers/scsi/libiscsi.c
index fb65311c81dd..864c6284e83c 100644
--- a/trunk/drivers/scsi/libiscsi.c
+++ b/trunk/drivers/scsi/libiscsi.c
@@ -1593,7 +1593,8 @@ int iscsi_conn_start(struct iscsi_cls_conn *cls_conn)
 		return -EPERM;
 	}
 
-	if (session->first_burst > session->max_burst) {
+	if ((session->imm_data_en || !session->initial_r2t_en) &&
+	     session->first_burst > session->max_burst) {
 		printk("iscsi: invalid burst lengths: "
 		       "first_burst %d max_burst %d\n",
 		       session->first_burst, session->max_burst);