wl12xx: correct fw_status structure for 8 sta support in AP-mode

Fix an erroneous labeling of array boundaries in the fw_status structure.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 384ba1944396b3bad954f5deaed9b420007d57b1..a51dd0ed6d2d5506233fb72cf49c9fd77b59120b 100644 (file)
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -4722,6 +4722,8 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
        int i, j, ret;
        unsigned int order;
 
+       BUILD_BUG_ON(AP_MAX_LINKS > WL12XX_MAX_LINKS);
+
        hw = ieee80211_alloc_hw(sizeof(*wl), &wl1271_ops);
        if (!hw) {
                wl1271_error("could not alloc ieee80211_hw");

diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index 45f03f578e18c23e42a4ae406030d3f4bf62684a..997f532450111577905c055eaacf122b6035b3fb 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -138,7 +138,7 @@ extern u32 wl12xx_debug_level;
 #define WL1271_DEFAULT_DTIM_PERIOD 1
 
 #define WL12XX_MAX_ROLES           4
-#define WL12XX_MAX_LINKS           8
+#define WL12XX_MAX_LINKS           12
 #define WL12XX_INVALID_ROLE_ID     0xff
 #define WL12XX_INVALID_LINK_ID     0xff
 
@@ -279,7 +279,7 @@ struct wl12xx_fw_status {
 
        /* Cumulative counter of released Voice memory blocks */
        u8 tx_voice_released_blks;
-       u8 padding_1[7];
+       u8 padding_1[3];
        __le32 log_start_addr;
 } __packed;