From 09fe8d0fd45cdf261a7ac7a7ca3d2cf8b867b605 Mon Sep 17 00:00:00 2001
From: James Smart <james.smart@emulex.com>
Date: Sat, 29 Sep 2012 11:32:27 -0400
Subject: [PATCH] --- yaml --- r: 334128 b: refs/heads/master c:
 2eb6862aaf7ea0685c997d833c3890dae2f94a62 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/scsi/lpfc/lpfc_els.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e2df0d81a0d4..7d0874357520 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4169d868bef8440eaa1e08abfdc205d1269bf9d1
+refs/heads/master: 2eb6862aaf7ea0685c997d833c3890dae2f94a62
diff --git a/trunk/drivers/scsi/lpfc/lpfc_els.c b/trunk/drivers/scsi/lpfc/lpfc_els.c
index c23f6415f76d..f19e9b6f9f13 100644
--- a/trunk/drivers/scsi/lpfc/lpfc_els.c
+++ b/trunk/drivers/scsi/lpfc/lpfc_els.c
@@ -809,6 +809,8 @@ lpfc_cmpl_els_flogi_nport(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
 	phba->fc_ratov = FF_DEF_RATOV;
 	rc = memcmp(&vport->fc_portname, &sp->portName,
 		    sizeof(vport->fc_portname));
+	memcpy(&phba->fc_fabparam, sp, sizeof(struct serv_parm));
+
 	if (rc >= 0) {
 		/* This side will initiate the PLOGI */
 		spin_lock_irq(shost->host_lock);