From 95ab4554a8f84a32603177ec1cf0ad0f7d96b03b Mon Sep 17 00:00:00 2001
From: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
Date: Tue, 16 Feb 2010 12:15:34 -0800
Subject: [PATCH] --- yaml --- r: 181362 b: refs/heads/master c:
 03bf7a5af58e07aa13ea61993f5892f733b6f46d h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9cb27ec7e6e0..95a3612d6950 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 696c1cff5254bb3ac280fbbb639c66e9ff20306e
+refs/heads/master: 03bf7a5af58e07aa13ea61993f5892f733b6f46d
diff --git a/trunk/drivers/scsi/fcoe/libfcoe.c b/trunk/drivers/scsi/fcoe/libfcoe.c
index 9823291395ad..511cb6b371ee 100644
--- a/trunk/drivers/scsi/fcoe/libfcoe.c
+++ b/trunk/drivers/scsi/fcoe/libfcoe.c
@@ -1187,7 +1187,7 @@ static void fcoe_ctlr_timeout(unsigned long arg)
 			next_timer = fip->ctlr_ka_time;
 
 		if (time_after_eq(jiffies, fip->port_ka_time)) {
-			fip->port_ka_time += jiffies +
+			fip->port_ka_time = jiffies +
 				msecs_to_jiffies(FIP_VN_KA_PERIOD);
 			fip->send_port_ka = 1;
 		}