[SCSI] lpfc 8.3.6 : FCoE Protocol Fixes

FCoE Protocol fixes.
 - Fixed FIP frame designation for ELS commands.
 - Fix CVL received on Port 1 not processed by driver.
 - Fix Zeroed frame on wire after FLOGI
 - Fix vport keep-alive does not contain the correct WWN.

Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/scsi/lpfc/lpfc_hw4.h b/drivers/scsi/lpfc/lpfc_hw4.h
index 4f03f1d876d0..95f8b4e0063d 100644
--- a/drivers/scsi/lpfc/lpfc_hw4.h
+++ b/drivers/scsi/lpfc/lpfc_hw4.h
@@ -453,6 +453,13 @@ struct lpfc_wqe_generic{
 #define lpfc_wqe_gen_wqec_SHIFT         7
 #define lpfc_wqe_gen_wqec_MASK          0x00000001
 #define lpfc_wqe_gen_wqec_WORD          word11
+#define ELS_ID_FLOGI 3
+#define ELS_ID_FDISC 2
+#define ELS_ID_LOGO  1
+#define ELS_ID_DEFAULT 0
+#define lpfc_wqe_gen_els_id_SHIFT       4
+#define lpfc_wqe_gen_els_id_MASK        0x00000003
+#define lpfc_wqe_gen_els_id_WORD        word11
 #define lpfc_wqe_gen_cmd_type_SHIFT     0
 #define lpfc_wqe_gen_cmd_type_MASK      0x0000000F
 #define lpfc_wqe_gen_cmd_type_WORD      word11
@@ -1395,8 +1402,7 @@ struct lpfc_mbx_reg_vfi {
 #define lpfc_reg_vfi_fcfi_SHIFT         0
 #define lpfc_reg_vfi_fcfi_MASK          0x0000FFFF
 #define lpfc_reg_vfi_fcfi_WORD          word2
-        uint32_t word3_rsvd;
-        uint32_t word4_rsvd;
+        uint32_t wwn[2];
         struct ulp_bde64 bde;
         uint32_t word8_rsvd;
         uint32_t word9_rsvd;