Merge tag 'iwlwifi-for-kalle-2015-04-28' of https://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / lpfc / lpfc_hw4.h

diff --git a/drivers/scsi/lpfc/lpfc_hw4.h b/drivers/scsi/lpfc/lpfc_hw4.h
index f432ec180cf819d3c05ed70f121733362c001ed1..1813c45946f47a517dba98dedf8cfc5b7c7a351f 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_hw4.h
+++ b/drivers/scsi/lpfc/lpfc_hw4.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2009-2014 Emulex.  All rights reserved.                *
+ * Copyright (C) 2009-2015 Emulex.  All rights reserved.                *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -3085,6 +3085,9 @@ struct lpfc_acqe_link {
 #define LPFC_ASYNC_LINK_SPEED_100MBPS          0x2
 #define LPFC_ASYNC_LINK_SPEED_1GBPS            0x3
 #define LPFC_ASYNC_LINK_SPEED_10GBPS           0x4
+#define LPFC_ASYNC_LINK_SPEED_20GBPS           0x5
+#define LPFC_ASYNC_LINK_SPEED_25GBPS           0x6
+#define LPFC_ASYNC_LINK_SPEED_40GBPS           0x7
 #define lpfc_acqe_link_duplex_SHIFT            16
 #define lpfc_acqe_link_duplex_MASK             0x000000FF
 #define lpfc_acqe_link_duplex_WORD             word0
@@ -3166,7 +3169,7 @@ struct lpfc_acqe_fc_la {
 #define lpfc_acqe_fc_la_speed_SHIFT            24
 #define lpfc_acqe_fc_la_speed_MASK             0x000000FF
 #define lpfc_acqe_fc_la_speed_WORD             word0
-#define LPFC_FC_LA_SPEED_UNKOWN                0x0
+#define LPFC_FC_LA_SPEED_UNKNOWN               0x0
 #define LPFC_FC_LA_SPEED_1G            0x1
 #define LPFC_FC_LA_SPEED_2G            0x2
 #define LPFC_FC_LA_SPEED_4G            0x4
@@ -3244,6 +3247,7 @@ struct lpfc_acqe_sli {
 #define LPFC_SLI_EVENT_TYPE_NVLOG_POST         0x4
 #define LPFC_SLI_EVENT_TYPE_DIAG_DUMP          0x5
 #define LPFC_SLI_EVENT_TYPE_MISCONFIGURED      0x9
+#define LPFC_SLI_EVENT_TYPE_REMOTE_DPORT       0xA
 };
 
 /*