These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / include / scsi / srp.h

diff --git a/kernel/include/scsi/srp.h b/kernel/include/scsi/srp.h
index 1ae84db..5be834d 100644 (file)
--- a/kernel/include/scsi/srp.h
+++ b/kernel/include/scsi/srp.h
@@ -42,6 +42,7 @@
  */
 
 #include <linux/types.h>
+#include <scsi/scsi.h>
 
 enum {
        SRP_LOGIN_REQ   = 0x00,
@@ -179,7 +180,7 @@ struct srp_tsk_mgmt {
        u8      reserved1[6];
        u64     tag;
        u8      reserved2[4];
-       __be64  lun __attribute__((packed));
+       struct scsi_lun lun;
        u8      reserved3[2];
        u8      tsk_mgmt_func;
        u8      reserved4;
@@ -200,7 +201,7 @@ struct srp_cmd {
        u8      data_in_desc_cnt;
        u64     tag;
        u8      reserved2[4];
-       __be64  lun __attribute__((packed));
+       struct scsi_lun lun;
        u8      reserved3;
        u8      task_attr;
        u8      reserved4;
@@ -265,7 +266,7 @@ struct srp_aer_req {
        __be32  req_lim_delta;
        u64     tag;
        u32     reserved2;
-       __be64  lun;
+       struct scsi_lun lun;
        __be32  sense_data_len;
        u32     reserved3;
        u8      sense_data[0];