From d42417510f9b79cd1e8ae58eaacaa3226402da0f Mon Sep 17 00:00:00 2001
From: Mike Christie <michaelc@cs.wisc.edu>
Date: Thu, 8 May 2008 20:15:34 -0500
Subject: [PATCH] --- yaml --- r: 96519 b: refs/heads/master c:
 c8611f975403dd20e6503aff8aded5dcb718f75b h: refs/heads/master i:   96517:
 86234b1a16820972ca0f297bca93a56a97fcec9b   96515:
 e1ceb268effebe0ddf02aa33842cb9540ec22a08   96511:
 38867d6fcc42ab4951ed8554d7f188b5fe2f95ba v: v3

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

diff --git a/[refs] b/[refs]
index 3f9fb46d8f12..0b5f3fe07ea8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cf1043593db6a337f10e006c23c69e5fc93e722
+refs/heads/master: c8611f975403dd20e6503aff8aded5dcb718f75b
diff --git a/trunk/drivers/scsi/libiscsi.c b/trunk/drivers/scsi/libiscsi.c
index 98164f3c3517..b43bf1d60dac 100644
--- a/trunk/drivers/scsi/libiscsi.c
+++ b/trunk/drivers/scsi/libiscsi.c
@@ -730,7 +730,9 @@ static int __iscsi_complete_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
 				if (iscsi_recv_pdu(conn->cls_conn, hdr, data,
 						   datalen))
 					rc = ISCSI_ERR_CONN_FAILED;
-			}
+			} else
+				mod_timer(&conn->transport_timer,
+					  jiffies + conn->recv_timeout);
 			iscsi_free_mgmt_task(conn, mtask);
 			break;
 		default:
@@ -1478,11 +1480,9 @@ static void iscsi_check_transport_timeouts(unsigned long data)
 	}
 
 	if (time_before_eq(last_recv + recv_timeout, jiffies)) {
-		if (time_before_eq(conn->last_ping, last_recv)) {
-			/* send a ping to try to provoke some traffic */
-			debug_scsi("Sending nopout as ping on conn %p\n", conn);
-			iscsi_send_nopout(conn, NULL);
-		}
+		/* send a ping to try to provoke some traffic */
+		debug_scsi("Sending nopout as ping on conn %p\n", conn);
+		iscsi_send_nopout(conn, NULL);
 		next_timeout = conn->last_ping + (conn->ping_timeout * HZ);
 	} else
 		next_timeout = last_recv + recv_timeout;