From f653bcec57c3e67f78b90587dafb19729d8cfd6e Mon Sep 17 00:00:00 2001
From: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
Date: Fri, 11 Jun 2010 16:43:44 -0700
Subject: [PATCH] --- yaml --- r: 204111 b: refs/heads/master c:
 516a648631c912e84e0035590f98eef1d716f4ea h: refs/heads/master i:   204109:
 5b871484dcf13ead393c3ebd4f0793df30b28287   204107:
 981a6f9ced52c138f0f7e41e659255abf8045065   204103:
 1243151b9dc01b6646aed8ecf5893071cb9c5248   204095:
 ae44d3e89a2ac6c3402b18fc52e14b61dc3a5e04 v: v3

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

diff --git a/[refs] b/[refs]
index d7252a9b95ca..5a008a1c5552 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1508f3ecd991ecbf272e08f5ee70d2618f49159e
+refs/heads/master: 516a648631c912e84e0035590f98eef1d716f4ea
diff --git a/trunk/drivers/scsi/fcoe/libfcoe.c b/trunk/drivers/scsi/fcoe/libfcoe.c
index 66120f135d99..1d5b949d4fd0 100644
--- a/trunk/drivers/scsi/fcoe/libfcoe.c
+++ b/trunk/drivers/scsi/fcoe/libfcoe.c
@@ -1232,8 +1232,11 @@ static void fcoe_ctlr_timer_work(struct work_struct *work)
 	fip->reset_req = 0;
 	spin_unlock_bh(&fip->lock);
 
-	if (reset)
+	if (reset) {
 		fc_lport_reset(fip->lp);
+		/* restart things with a solicitation */
+		fcoe_ctlr_solicit(fip, NULL);
+	}
 
 	if (fip->send_ctlr_ka) {
 		fip->send_ctlr_ka = 0;