]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
wifi: ath6kl: wmi: Avoid -Wflex-array-member-not-at-end warning
authorGustavo A. R. Silva <gustavoars@kernel.org>
Tue, 24 Feb 2026 04:46:17 +0000 (13:46 +0900)
committerJeff Johnson <jeff.johnson@oss.qualcomm.com>
Fri, 6 Mar 2026 20:23:16 +0000 (12:23 -0800)
-Wflex-array-member-not-at-end was introduced in GCC-14, and we are
getting ready to enable it, globally.

Remove unused structures bss_bias_info and bss_bias, and member
bss in struct roam_ctrl_cmd.

After these changes, the size of struct roam_ctrl_cmd, along
with its member's offsets remain the same, hence the memory layout
doesn't change:

Before changes:
struct roam_ctrl_cmd {
union {
u8                 bssid[6];             /*     0     6 */
u8                 roam_mode;            /*     0     1 */
struct bss_bias_info bss;                /*     0     1 */
struct low_rssi_scan_params params;      /*     0     8 */
} info;                                          /*     0     8 */
u8                         roam_ctrl;            /*     8     1 */

/* size: 9, cachelines: 1, members: 2 */
/* last cacheline: 9 bytes */
} __attribute__((__packed__));

After changes:
struct roam_ctrl_cmd {
union {
u8                 bssid[6];             /*     0     6 */
u8                 roam_mode;            /*     0     1 */
struct low_rssi_scan_params params;      /*     0     8 */
} info;                                          /*     0     8 */
u8                         roam_ctrl;            /*     8     1 */

/* size: 9, cachelines: 1, members: 2 */
/* last cacheline: 9 bytes */
} __attribute__((__packed__));

With these changes fix the following warning:

drivers/net/wireless/ath/ath6kl/wmi.h:1658:20: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]

Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Link: https://patch.msgid.link/aZ0tGZnmtGckKJzY@kspp
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
drivers/net/wireless/ath/ath6kl/wmi.h

index 3080d82e25cc204a7808dda3088190a0056f8396..8fbece3fdad9f42160f69ff50821bf12add3bbe7 100644 (file)
@@ -1630,16 +1630,6 @@ enum wmi_roam_mode {
        WMI_LOCK_BSS_MODE = 3, /* Lock to the current BSS */
 };
 
-struct bss_bias {
-       u8 bssid[ETH_ALEN];
-       s8 bias;
-} __packed;
-
-struct bss_bias_info {
-       u8 num_bss;
-       struct bss_bias bss_bias[];
-} __packed;
-
 struct low_rssi_scan_params {
        __le16 lrssi_scan_period;
        a_sle16 lrssi_scan_threshold;
@@ -1652,7 +1642,6 @@ struct roam_ctrl_cmd {
        union {
                u8 bssid[ETH_ALEN]; /* WMI_FORCE_ROAM */
                u8 roam_mode; /* WMI_SET_ROAM_MODE */
-               struct bss_bias_info bss; /* WMI_SET_HOST_BIAS */
                struct low_rssi_scan_params params; /* WMI_SET_LRSSI_SCAN_PARAMS
                                                     */
        } __packed info;