Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

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

diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index 6b97ee45c7b460d0719f99baa011a6e13706aa67..e4fb17a58649e22c110ae92490e0368a5e595505 100644 (file)
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -39,8 +39,8 @@
 /*
  * Literals
  */
-#define IPR_DRIVER_VERSION "2.6.1"
-#define IPR_DRIVER_DATE "(March 12, 2015)"
+#define IPR_DRIVER_VERSION "2.6.2"
+#define IPR_DRIVER_DATE "(June 11, 2015)"
 
 /*
  * IPR_MAX_CMD_PER_LUN: This defines the maximum number of outstanding
@@ -1005,13 +1005,13 @@ struct ipr_hostrcb_type_24_error {
 struct ipr_hostrcb_type_07_error {
        u8 failure_reason[64];
        struct ipr_vpd vpd;
-       u32 data[222];
+       __be32 data[222];
 }__attribute__((packed, aligned (4)));
 
 struct ipr_hostrcb_type_17_error {
        u8 failure_reason[64];
        struct ipr_ext_vpd vpd;
-       u32 data[476];
+       __be32 data[476];
 }__attribute__((packed, aligned (4)));
 
 struct ipr_hostrcb_config_element {
@@ -1289,18 +1289,17 @@ struct ipr_resource_entry {
        (((res)->bus << 24) | ((res)->target << 8) | (res)->lun)
 
        u8 ata_class;
-
-       u8 flags;
-       __be16 res_flags;
-
        u8 type;
 
+       u16 flags;
+       u16 res_flags;
+
        u8 qmodel;
        struct ipr_std_inq_data std_inq_data;
 
        __be32 res_handle;
        __be64 dev_id;
-       __be64 lun_wwn;
+       u64 lun_wwn;
        struct scsi_lun dev_lun;
        u8 res_path[8];