1 files changed, 35 insertions, 3 deletions

diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 0f6e2548f35d..60d6ca2f68c2 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2012 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2013 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -6158,12 +6158,44 @@ lpfc_read_fcf_conn_tbl(struct lpfc_hba *phba,
                 memcpy(&conn_entry->conn_rec, &conn_rec[i],
                         sizeof(struct lpfc_fcf_conn_rec));
                 conn_entry->conn_rec.vlan_tag =
-                        le16_to_cpu(conn_entry->conn_rec.vlan_tag) & 0xFFF;
+                        conn_entry->conn_rec.vlan_tag;
                 conn_entry->conn_rec.flags =
-                        le16_to_cpu(conn_entry->conn_rec.flags);
+                        conn_entry->conn_rec.flags;
                 list_add_tail(&conn_entry->list,
                         &phba->fcf_conn_rec_list);
         }
+
+        if (!list_empty(&phba->fcf_conn_rec_list)) {
+                i = 0;
+                list_for_each_entry(conn_entry, &phba->fcf_conn_rec_list,
+                                    list) {
+                        conn_rec = &conn_entry->conn_rec;
+                        lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                                        "3345 FCF connection list rec[%02d]: "
+                                        "flags:x%04x, vtag:x%04x, "
+                                        "fabric_name:x%02x:%02x:%02x:%02x:"
+                                        "%02x:%02x:%02x:%02x, "
+                                        "switch_name:x%02x:%02x:%02x:%02x:"
+                                        "%02x:%02x:%02x:%02x\n", i++,
+                                        conn_rec->flags, conn_rec->vlan_tag,
+                                        conn_rec->fabric_name[0],
+                                        conn_rec->fabric_name[1],
+                                        conn_rec->fabric_name[2],
+                                        conn_rec->fabric_name[3],
+                                        conn_rec->fabric_name[4],
+                                        conn_rec->fabric_name[5],
+                                        conn_rec->fabric_name[6],
+                                        conn_rec->fabric_name[7],
+                                        conn_rec->switch_name[0],
+                                        conn_rec->switch_name[1],
+                                        conn_rec->switch_name[2],
+                                        conn_rec->switch_name[3],
+                                        conn_rec->switch_name[4],
+                                        conn_rec->switch_name[5],
+                                        conn_rec->switch_name[6],
+                                        conn_rec->switch_name[7]);
+                }
+        }
 }
 
 /**