From: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
Date: Fri, 5 Aug 2011 00:38:35 +0000 (-0700)
Subject: [SCSI] bnx2fc: Reset the max receive frame size
X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~451
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=447b480febb7d563ed8a91508318e79db38a9f02;p=users%2Fjedix%2Flinux-maple.git

[SCSI] bnx2fc: Reset the max receive frame size

Reset max receive frame size every time before attempting FLOGI. Without this,
the stale MFS value will be used.

Signed-off-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
(cherry picked from commit 627e628f6662550455e57466148d03f354ecdd3b)

Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index 833e9122e018..2e37db08a5a9 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -1736,6 +1736,11 @@ static void bnx2fc_start_disc(struct bnx2fc_interface *interface)
 		if (++wait_cnt > 12)
 			break;
 	}
+
+	/* Reset max receive frame size to default */
+	if (fc_set_mfs(lport, BNX2FC_MFS))
+		return;
+
 	fc_lport_init(lport);
 	fc_fabric_login(lport);
 }