Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (147 commits)
  [SCSI] arcmsr: fix write to device check
  [SCSI] lpfc: lower stack use in lpfc_fc_frame_check
  [SCSI] eliminate an unnecessary local variable from scsi_remove_target()
  [SCSI] libiscsi: use bh locking instead of irq with session lock
  [SCSI] libiscsi: do not take host lock in queuecommand
  [SCSI] be2iscsi: fix null ptr when accessing task hdr
  [SCSI] be2iscsi: fix gfp use in alloc_pdu
  [SCSI] libiscsi: add more informative failure message during iscsi scsi eh
  [SCSI] gdth: Add missing call to gdth_ioctl_free
  [SCSI] bfa: remove unused defintions and misc cleanups
  [SCSI] bfa: remove inactive functions
  [SCSI] bfa: replace bfa_assert with WARN_ON
  [SCSI] qla2xxx: Use sg_next to fetch next sg element while walking sg list.
  [SCSI] qla2xxx: Fix to avoid recursive lock failure during BSG timeout.
  [SCSI] qla2xxx: Remove code to not reset ISP82xx on failure.
  [SCSI] qla2xxx: Display mailbox register 4 during 8012 AEN for ISP82XX parts.
  [SCSI] qla2xxx: Don't perform a BIG_HAMMER if Get-ID (0x20) mailbox command fails on CNAs.
  [SCSI] qla2xxx: Remove redundant module parameter permission bits
  [SCSI] qla2xxx: Add sysfs node for displaying board temperature.
  [SCSI] qla2xxx: Code cleanup to remove unwanted comments and code.
  ...

1 files changed, 26 insertions, 22 deletions

diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index 463b74902ac..c004fa9a681 100644
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -48,14 +48,14 @@
 #include "lpfc_vport.h"
 #include "lpfc_debugfs.h"
 
-#define HBA_PORTSPEED_UNKNOWN               0   /* Unknown - transceiver
-                                                 * incapable of reporting */
-#define HBA_PORTSPEED_1GBIT                 1   /* 1 GBit/sec */
-#define HBA_PORTSPEED_2GBIT                 2   /* 2 GBit/sec */
-#define HBA_PORTSPEED_4GBIT                 8   /* 4 GBit/sec */
-#define HBA_PORTSPEED_8GBIT                16   /* 8 GBit/sec */
-#define HBA_PORTSPEED_10GBIT                4   /* 10 GBit/sec */
-#define HBA_PORTSPEED_NOT_NEGOTIATED        5   /* Speed not established */
+/* FDMI Port Speed definitions */
+#define HBA_PORTSPEED_1GBIT             0x0001  /* 1 GBit/sec */
+#define HBA_PORTSPEED_2GBIT             0x0002  /* 2 GBit/sec */
+#define HBA_PORTSPEED_4GBIT             0x0008  /* 4 GBit/sec */
+#define HBA_PORTSPEED_10GBIT            0x0004  /* 10 GBit/sec */
+#define HBA_PORTSPEED_8GBIT             0x0010  /* 8 GBit/sec */
+#define HBA_PORTSPEED_16GBIT            0x0020  /* 16 GBit/sec */
+#define HBA_PORTSPEED_UNKNOWN           0x0800  /* Unknown */
 
 #define FOURBYTES       4
 
@@ -1593,8 +1593,10 @@ lpfc_fdmi_cmd(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, int cmdcode)
                         ae->ad.bits.AttrLen = be16_to_cpu(FOURBYTES + 4);
 
                         ae->un.SupportSpeed = 0;
+                        if (phba->lmt & LMT_16Gb)
+                                ae->un.SupportSpeed |= HBA_PORTSPEED_16GBIT;
                         if (phba->lmt & LMT_10Gb)
-                                ae->un.SupportSpeed = HBA_PORTSPEED_10GBIT;
+                                ae->un.SupportSpeed |= HBA_PORTSPEED_10GBIT;
                         if (phba->lmt & LMT_8Gb)
                                 ae->un.SupportSpeed |= HBA_PORTSPEED_8GBIT;
                         if (phba->lmt & LMT_4Gb)
@@ -1612,24 +1614,26 @@ lpfc_fdmi_cmd(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, int cmdcode)
                         ae->ad.bits.AttrType = be16_to_cpu(PORT_SPEED);
                         ae->ad.bits.AttrLen = be16_to_cpu(FOURBYTES + 4);
                         switch(phba->fc_linkspeed) {
-                                case LA_1GHZ_LINK:
-                                        ae->un.PortSpeed = HBA_PORTSPEED_1GBIT;
+                        case LPFC_LINK_SPEED_1GHZ:
+                                ae->un.PortSpeed = HBA_PORTSPEED_1GBIT;
                                 break;
-                                case LA_2GHZ_LINK:
-                                        ae->un.PortSpeed = HBA_PORTSPEED_2GBIT;
+                        case LPFC_LINK_SPEED_2GHZ:
+                                ae->un.PortSpeed = HBA_PORTSPEED_2GBIT;
                                 break;
-                                case LA_4GHZ_LINK:
-                                        ae->un.PortSpeed = HBA_PORTSPEED_4GBIT;
+                        case LPFC_LINK_SPEED_4GHZ:
+                                ae->un.PortSpeed = HBA_PORTSPEED_4GBIT;
                                 break;
-                                case LA_8GHZ_LINK:
-                                        ae->un.PortSpeed = HBA_PORTSPEED_8GBIT;
+                        case LPFC_LINK_SPEED_8GHZ:
+                                ae->un.PortSpeed = HBA_PORTSPEED_8GBIT;
                                 break;
-                                case LA_10GHZ_LINK:
-                                        ae->un.PortSpeed = HBA_PORTSPEED_10GBIT;
+                        case LPFC_LINK_SPEED_10GHZ:
+                                ae->un.PortSpeed = HBA_PORTSPEED_10GBIT;
                                 break;
-                                default:
-                                        ae->un.PortSpeed =
-                                                HBA_PORTSPEED_UNKNOWN;
+                        case LPFC_LINK_SPEED_16GHZ:
+                                ae->un.PortSpeed = HBA_PORTSPEED_16GBIT;
+                                break;
+                        default:
+                                ae->un.PortSpeed = HBA_PORTSPEED_UNKNOWN;
                                 break;
                         }
                         pab->ab.EntryCnt++;