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

[kvmfornfv.git] / kernel / drivers / net / ethernet / brocade / bna / bfi_cna.h

diff --git a/kernel/drivers/net/ethernet/brocade/bna/bfi_cna.h b/kernel/drivers/net/ethernet/brocade/bna/bfi_cna.h
index bd605be..fad6511 100644 (file)
--- a/kernel/drivers/net/ethernet/brocade/bna/bfi_cna.h
+++ b/kernel/drivers/net/ethernet/brocade/bna/bfi_cna.h
@@ -22,8 +22,6 @@
 #include "bfi.h"
 #include "bfa_defs_cna.h"
 
-#pragma pack(1)
-
 enum bfi_port_h2i {
        BFI_PORT_H2I_ENABLE_REQ         = (1),
        BFI_PORT_H2I_DISABLE_REQ        = (2),
@@ -43,7 +41,7 @@ struct bfi_port_generic_req {
        struct bfi_mhdr mh;             /*!< msg header                     */
        u32     msgtag;         /*!< msgtag for reply               */
        u32     rsvd;
-};
+} __packed;
 
 /* Generic RSP type */
 struct bfi_port_generic_rsp {
@@ -51,13 +49,13 @@ struct bfi_port_generic_rsp {
        u8              status;         /*!< port enable status             */
        u8              rsvd[3];
        u32     msgtag;         /*!< msgtag for reply               */
-};
+} __packed;
 
 /* BFI_PORT_H2I_GET_STATS_REQ */
 struct bfi_port_get_stats_req {
        struct bfi_mhdr mh;             /*!< common msg header              */
        union bfi_addr_u   dma_addr;
-};
+} __packed;
 
 union bfi_port_h2i_msg_u {
        struct bfi_mhdr mh;
@@ -65,7 +63,7 @@ union bfi_port_h2i_msg_u {
        struct bfi_port_generic_req disable_req;
        struct bfi_port_get_stats_req getstats_req;
        struct bfi_port_generic_req clearstats_req;
-};
+} __packed;
 
 union bfi_port_i2h_msg_u {
        struct bfi_mhdr mh;
@@ -73,7 +71,7 @@ union bfi_port_i2h_msg_u {
        struct bfi_port_generic_rsp disable_rsp;
        struct bfi_port_generic_rsp getstats_rsp;
        struct bfi_port_generic_rsp clearstats_rsp;
-};
+} __packed;
 
 /* @brief Mailbox commands from host to (DCBX/LLDP) firmware */
 enum bfi_cee_h2i_msgs {
@@ -97,7 +95,7 @@ enum bfi_cee_i2h_msgs {
  */
 struct bfi_lldp_reset_stats {
        struct bfi_mhdr mh;
-};
+} __packed;
 
 /*
  * @brief H2I command structure for resetting the stats.
@@ -105,7 +103,7 @@ struct bfi_lldp_reset_stats {
  */
 struct bfi_cee_reset_stats {
        struct bfi_mhdr mh;
-};
+} __packed;
 
 /*
  * @brief  get configuration  command from host
@@ -114,7 +112,7 @@ struct bfi_cee_reset_stats {
 struct bfi_cee_get_req {
        struct bfi_mhdr mh;
        union bfi_addr_u   dma_addr;
-};
+} __packed;
 
 /*
  * @brief reply message from firmware
@@ -124,7 +122,7 @@ struct bfi_cee_get_rsp {
        struct bfi_mhdr mh;
        u8                      cmd_status;
        u8                      rsvd[3];
-};
+} __packed;
 
 /*
  * @brief  get configuration  command from host
@@ -133,7 +131,7 @@ struct bfi_cee_get_rsp {
 struct bfi_cee_stats_req {
        struct bfi_mhdr mh;
        union bfi_addr_u   dma_addr;
-};
+} __packed;
 
 /*
  * @brief reply message from firmware
@@ -143,22 +141,20 @@ struct bfi_cee_stats_rsp {
        struct bfi_mhdr mh;
        u8                      cmd_status;
        u8                      rsvd[3];
-};
+} __packed;
 
 /* @brief mailbox command structures from host to firmware */
 union bfi_cee_h2i_msg_u {
        struct bfi_mhdr mh;
        struct bfi_cee_get_req get_req;
        struct bfi_cee_stats_req stats_req;
-};
+} __packed;
 
 /* @brief mailbox message structures from firmware to host     */
 union bfi_cee_i2h_msg_u {
        struct bfi_mhdr mh;
        struct bfi_cee_get_rsp get_rsp;
        struct bfi_cee_stats_rsp stats_rsp;
-};
-
-#pragma pack()
+} __packed;
 
 #endif /* __BFI_CNA_H__ */