carl9170: Replace zero-length array of trailing structs with flex-array

[carl9170fw.git] / include / shared / fwcmd.h

diff --git a/include/shared/fwcmd.h b/include/shared/fwcmd.h
index ea1d80f9a50efb3a8d4c59113c6782479b90d8aa..ff4b3b50250c673425ea61e0d00708c629972e02 100644 (file)
--- a/include/shared/fwcmd.h
+++ b/include/shared/fwcmd.h
@@ -118,16 +118,16 @@ struct carl9170_reg_list {
 } __packed;
 
 struct carl9170_write_reg {
-       struct {
+       DECLARE_FLEX_ARRAY(struct {
                __le32          addr;
                __le32          val;
-       } regs[0] __packed;
+       } __packed, regs);
 } __packed;
 
 struct carl9170_write_reg_byte {
        __le32  addr;
        __le32  count;
-       u8      val[0];
+       u8      val[];
 } __packed;
 
 #define        CARL9170FW_PHY_HT_ENABLE                0x4
@@ -240,7 +240,7 @@ struct carl9170_cmd {
                struct carl9170_bcn_ctrl_cmd    bcn_ctrl;
                struct carl9170_rx_filter_cmd   rx_filter;
                u8 data[CARL9170_MAX_CMD_PAYLOAD_LEN];
-       } __packed;
+       } __packed __aligned(4);
 } __packed __aligned(4);
 
 #define        CARL9170_TX_STATUS_QUEUE        3