From a5357c354ab0b5e8f58a93618066973edb47520c Mon Sep 17 00:00:00 2001
From: Jamie Wellnitz <Jamie.Wellnitz@emulex.com>
Date: Tue, 28 Feb 2006 19:25:32 -0500
Subject: [PATCH] --- yaml --- r: 22559 b: refs/heads/master c:
 367c27134a94dce351080ae66ab87a1b296d1e64 h: refs/heads/master i:   22557:
 ef937987a6af4245ed457f8b19f7c7fff73f3e90   22555:
 2bc7136a92dd1e93f33815a23262145d5e7518a5   22551:
 2f5dcbaac6a01e4b7d467c5e2adccf4db72a4233   22543:
 19dc565435c00934b9d5e0e7ca7fb2bf738a7e33   22527:
 39c72eff6be891261acf8c0b8203327be14b8cf6 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/scsi/lpfc/lpfc_attr.c | 3 ++-
 trunk/drivers/scsi/lpfc/lpfc_mbox.c | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9386bd265108..cec564c39f26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fe165b65089925292122e9772321738627f325c
+refs/heads/master: 367c27134a94dce351080ae66ab87a1b296d1e64
diff --git a/trunk/drivers/scsi/lpfc/lpfc_attr.c b/trunk/drivers/scsi/lpfc/lpfc_attr.c
index e7aca3c4b26e..998c863fdc7e 100644
--- a/trunk/drivers/scsi/lpfc/lpfc_attr.c
+++ b/trunk/drivers/scsi/lpfc/lpfc_attr.c
@@ -616,6 +616,7 @@ LPFC_ATTR_RW(nodev_tmo, 30, 0, 255,
 /*
 # lpfc_topology:  link topology for init link
 #            0x0  = attempt loop mode then point-to-point
+#            0x01 = internal loopback mode
 #            0x02 = attempt point-to-point mode only
 #            0x04 = attempt loop mode only
 #            0x06 = attempt point-to-point mode then loop
@@ -623,7 +624,7 @@ LPFC_ATTR_RW(nodev_tmo, 30, 0, 255,
 # Set loop mode if you want to run as an NL_Port. Value range is [0,0x6].
 # Default value is 0.
 */
-LPFC_ATTR_R(topology, 0, 0, 6, "Select Fibre Channel topology");
+LPFC_ATTR_RW(topology, 0, 0, 6, "Select Fibre Channel topology");
 
 /*
 # lpfc_link_speed: Link speed selection for initializing the Fibre Channel
diff --git a/trunk/drivers/scsi/lpfc/lpfc_mbox.c b/trunk/drivers/scsi/lpfc/lpfc_mbox.c
index df88b78707de..c585e2b2e589 100644
--- a/trunk/drivers/scsi/lpfc/lpfc_mbox.c
+++ b/trunk/drivers/scsi/lpfc/lpfc_mbox.c
@@ -195,6 +195,9 @@ lpfc_init_link(struct lpfc_hba * phba,
 		mb->un.varInitLnk.link_flags = FLAGS_TOPOLOGY_MODE_PT_PT;
 		mb->un.varInitLnk.link_flags |= FLAGS_TOPOLOGY_FAILOVER;
 		break;
+	case FLAGS_LOCAL_LB:
+		mb->un.varInitLnk.link_flags = FLAGS_LOCAL_LB;
+		break;
 	}
 
 	/* NEW_FEATURE