From bcdc43c43cbbbda2d45e2d3d67f8cc61c7db60ab Mon Sep 17 00:00:00 2001
From: Joe Eykholt <jeykholt@cisco.com>
Date: Tue, 30 Nov 2010 16:20:07 -0800
Subject: [PATCH] --- yaml --- r: 226808 b: refs/heads/master c:
 981c1154b240ee77133a478fcd3853ac18111672 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b6a3be59d147..79029b74f5f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9069f5c433e402be5707f37f3d0dfb376659c1e4
+refs/heads/master: 981c1154b240ee77133a478fcd3853ac18111672
diff --git a/trunk/drivers/scsi/fcoe/libfcoe.c b/trunk/drivers/scsi/fcoe/libfcoe.c
index dcccb0bf3170..1a0bb230dd03 100644
--- a/trunk/drivers/scsi/fcoe/libfcoe.c
+++ b/trunk/drivers/scsi/fcoe/libfcoe.c
@@ -999,6 +999,17 @@ static void fcoe_ctlr_recv_adv(struct fcoe_ctlr *fip, struct sk_buff *skb)
 	if (first && time_after(jiffies, fip->sol_time + sol_tov))
 		fcoe_ctlr_solicit(fip, NULL);
 
+	/*
+	 * Put this FCF at the head of the list for priority among equals.
+	 * This helps in the case of an NPV switch which insists we use
+	 * the FCF that answers multicast solicitations, not the others that
+	 * are sending periodic multicast advertisements.
+	 */
+	if (mtu_valid) {
+		list_del(&fcf->list);
+		list_add(&fcf->list, &fip->fcfs);
+	}
+
 	/*
 	 * If this is the first validated FCF, note the time and
 	 * set a timer to trigger selection.