aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArik Nemtsov <arik@wizery.com>2011-09-22 02:52:05 -0400
committerLuciano Coelho <coelho@ti.com>2011-09-23 08:59:54 -0400
commitf80c2d12e51845c3a697e9ce9d8a98287f1aae38 (patch)
tree8de53fa6d9a15cab81967515a14c1e90bc091382
parentaf7fbb28efff0c0d8fc0852ad6622e5437a7611e (diff)
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>
-rw-r--r--drivers/net/wireless/wl12xx/main.c2
-rw-r--r--drivers/net/wireless/wl12xx/wl12xx.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 384ba1944396..a51dd0ed6d2d 100644
--- 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)
4722 int i, j, ret; 4722 int i, j, ret;
4723 unsigned int order; 4723 unsigned int order;
4724 4724
4725 BUILD_BUG_ON(AP_MAX_LINKS > WL12XX_MAX_LINKS);
4726
4725 hw = ieee80211_alloc_hw(sizeof(*wl), &wl1271_ops); 4727 hw = ieee80211_alloc_hw(sizeof(*wl), &wl1271_ops);
4726 if (!hw) { 4728 if (!hw) {
4727 wl1271_error("could not alloc ieee80211_hw"); 4729 wl1271_error("could not alloc ieee80211_hw");
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index 45f03f578e18..997f53245011 100644
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -138,7 +138,7 @@ extern u32 wl12xx_debug_level;
138#define WL1271_DEFAULT_DTIM_PERIOD 1 138#define WL1271_DEFAULT_DTIM_PERIOD 1
139 139
140#define WL12XX_MAX_ROLES 4 140#define WL12XX_MAX_ROLES 4
141#define WL12XX_MAX_LINKS 8 141#define WL12XX_MAX_LINKS 12
142#define WL12XX_INVALID_ROLE_ID 0xff 142#define WL12XX_INVALID_ROLE_ID 0xff
143#define WL12XX_INVALID_LINK_ID 0xff 143#define WL12XX_INVALID_LINK_ID 0xff
144 144
@@ -279,7 +279,7 @@ struct wl12xx_fw_status {
279 279
280 /* Cumulative counter of released Voice memory blocks */ 280 /* Cumulative counter of released Voice memory blocks */
281 u8 tx_voice_released_blks; 281 u8 tx_voice_released_blks;
282 u8 padding_1[7]; 282 u8 padding_1[3];
283 __le32 log_start_addr; 283 __le32 log_start_addr;
284} __packed; 284} __packed;
285 285