Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 266354
b: refs/heads/master
c: f80c2d1
h: refs/heads/master
v: v3
  • Loading branch information
Arik Nemtsov authored and Luciano Coelho committed Sep 23, 2011
1 parent fe93431 commit 3791e1a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: af7fbb28efff0c0d8fc0852ad6622e5437a7611e
refs/heads/master: f80c2d12e51845c3a697e9ce9d8a98287f1aae38
2 changes: 2 additions & 0 deletions trunk/drivers/net/wireless/wl12xx/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/net/wireless/wl12xx/wl12xx.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 3791e1a

Please sign in to comment.