redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

wlcore/wl12xx/wl18xx: configure max_stations per-hw 

Each hw supports a different max stations (connected to the
same ap). add a new wl->max_ap_stations and use it instead
of the current common AP_MAX_STATIONS.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
hifive-unleashed-5.1
Eliad Peller 2014-02-10 13:47:23 +02:00 committed by John W. Linville
parent da08fdfaf0
commit 32f0fd5b70
7 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/ti/wl12xx/main.c
View File

@ -1750,11 +1750,13 @@ static int wl12xx_setup(struct wl1271 *wl)
struct wl12xx_platform_data *pdata = pdev_data->pdata;
BUILD_BUG_ON(WL12XX_MAX_LINKS > WLCORE_MAX_LINKS);
BUILD_BUG_ON(WL12XX_MAX_AP_STATIONS > WL12XX_MAX_LINKS);
wl->rtable = wl12xx_rtable;
wl->num_tx_desc = WL12XX_NUM_TX_DESCRIPTORS;
wl->num_rx_desc = WL12XX_NUM_RX_DESCRIPTORS;
wl->num_links = WL12XX_MAX_LINKS;
wl->max_ap_stations = WL12XX_MAX_AP_STATIONS;
wl->num_channels = 1;
wl->num_mac_addr = WL12XX_NUM_MAC_ADDRESSES;
wl->band_rate_to_idx = wl12xx_band_rate_to_idx;

1
drivers/net/wireless/ti/wl12xx/wl12xx.h
View File

@ -65,6 +65,7 @@
#define WL12XX_RX_BA_MAX_SESSIONS 3
#define WL12XX_MAX_AP_STATIONS 8
#define WL12XX_MAX_LINKS 12
struct wl127x_rx_mem_pool_addr {

2
drivers/net/wireless/ti/wl18xx/main.c
View File

@ -1753,11 +1753,13 @@ static int wl18xx_setup(struct wl1271 *wl)
int ret;
BUILD_BUG_ON(WL18XX_MAX_LINKS > WLCORE_MAX_LINKS);
BUILD_BUG_ON(WL18XX_MAX_AP_STATIONS > WL18XX_MAX_LINKS);
wl->rtable = wl18xx_rtable;
wl->num_tx_desc = WL18XX_NUM_TX_DESCRIPTORS;
wl->num_rx_desc = WL18XX_NUM_RX_DESCRIPTORS;
wl->num_links = WL18XX_MAX_LINKS;
wl->max_ap_stations = WL18XX_MAX_AP_STATIONS;
wl->num_channels = 2;
wl->num_mac_addr = WL18XX_NUM_MAC_ADDRESSES;
wl->band_rate_to_idx = wl18xx_band_rate_to_idx;

1
drivers/net/wireless/ti/wl18xx/wl18xx.h
View File

@ -42,6 +42,7 @@
#define WL18XX_RX_BA_MAX_SESSIONS 5
#define WL18XX_MAX_AP_STATIONS 8
#define WL18XX_MAX_LINKS 12
struct wl18xx_priv {

4
drivers/net/wireless/ti/wlcore/main.c
View File

@ -4662,7 +4662,7 @@ static int wl1271_allocate_sta(struct wl1271 *wl,
int ret;
if (wl->active_sta_count >= AP_MAX_STATIONS) {
if (wl->active_sta_count >= wl->max_ap_stations) {
wl1271_warning("could not allocate HLID - too much stations");
return -EBUSY;
}
@ -5855,8 +5855,6 @@ struct ieee80211_hw *wlcore_alloc_hw(size_t priv_size, u32 aggr_buf_size,
int i, j, ret;
unsigned int order;
BUILD_BUG_ON(AP_MAX_STATIONS > WLCORE_MAX_LINKS);
hw = ieee80211_alloc_hw(sizeof(*wl), &wl1271_ops);
if (!hw) {
wl1271_error("could not alloc ieee80211_hw");

2
drivers/net/wireless/ti/wlcore/wlcore.h
View File

@ -438,6 +438,8 @@ struct wl1271 {
u32 num_rx_desc;
/* number of links the HW supports */
u8 num_links;
/* max stations a single AP can support */
u8 max_ap_stations;
/* translate HW Tx rates to standard rate-indices */
const u8 **band_rate_to_idx;

2
drivers/net/wireless/ti/wlcore/wlcore_i.h
View File

@ -123,8 +123,6 @@ struct wl1271_chip {
#define NUM_TX_QUEUES 4
#define AP_MAX_STATIONS 8
struct wl_fw_status {
u32 intr;
u8 fw_rx_counter;