scsi/lpfc: Fixed the ability to process T10 DIF/Blockguard with SLI4 16Gb FC Adapters...

commit id: acd6859b084d1e1b3ec8bc9befe6532223260d33

Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>

diff --git a/drivers/scsi/lpfc/lpfc_crtn.h b/drivers/scsi/lpfc/lpfc_crtn.h
index 63759d7ee5c32a1e2408f7331664a3021ae418da..bf057012f9600dc09ca97e4c89bc12be685dbee6 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_crtn.h
+++ b/drivers/scsi/lpfc/lpfc_crtn.h
@@ -107,7 +107,7 @@ void lpfc_cleanup(struct lpfc_vport *);
 void lpfc_disc_timeout(unsigned long);
 
 struct lpfc_nodelist *__lpfc_findnode_rpi(struct lpfc_vport *, uint16_t);
-struct lpfc_nodelist * lpfc_findnode_rpi(struct lpfc_vport *, uint16_t);
+struct lpfc_nodelist *lpfc_findnode_rpi(struct lpfc_vport *, uint16_t);
 void lpfc_worker_wake_up(struct lpfc_hba *);
 int lpfc_workq_post_event(struct lpfc_hba *, void *, void *, uint32_t);
 int lpfc_do_work(void *);

diff --git a/drivers/scsi/lpfc/lpfc_hw4.h b/drivers/scsi/lpfc/lpfc_hw4.h
index abe136a53e3dfa36a4965d380a70c743f722889d..4aecb5c4e602928e049b6a51a0c267a6a4031400 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_hw4.h
+++ b/drivers/scsi/lpfc/lpfc_hw4.h
@@ -889,11 +889,11 @@ struct mbox_header {
 #define LPFC_MBOX_OPCODE_GET_ALLOC_RSRC_EXTENT         0x9B
 #define LPFC_MBOX_OPCODE_ALLOC_RSRC_EXTENT             0x9C
 #define LPFC_MBOX_OPCODE_DEALLOC_RSRC_EXTENT           0x9D
-#define LPFC_MBOX_OPCODE_GET_FUNCTION_CONFIG           0xA0
+#define LPFC_MBOX_OPCODE_GET_FUNCTION_CONFIG           0xA0
 #define LPFC_MBOX_OPCODE_GET_PROFILE_CONFIG            0xA4
-#define LPFC_MBOX_OPCODE_SET_PROFILE_CONFIG            0xA5
+#define LPFC_MBOX_OPCODE_SET_PROFILE_CONFIG            0xA5
 #define LPFC_MBOX_OPCODE_GET_PROFILE_LIST              0xA6
-#define LPFC_MBOX_OPCODE_SET_ACT_PROFILE               0xA8
+#define LPFC_MBOX_OPCODE_SET_ACT_PROFILE               0xA8
 #define LPFC_MBOX_OPCODE_GET_FACTORY_PROFILE_CONFIG    0xA9
 #define LPFC_MBOX_OPCODE_READ_OBJECT                   0xAB
 #define LPFC_MBOX_OPCODE_WRITE_OBJECT                  0xAC

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 8843d767cb6c55c7cdee010ce75a0c1e4578cbae..c04703a093bd856a700163e4b4974d2b6ffd59df 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -4649,7 +4649,7 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba)
                goto out_remove_rpi_hdrs;
        }
 
-       /* 
+       /*
         * The cfg_fcp_eq_count can be zero whenever there is exactly one
         * interrupt vector.  This is not an error
         */