evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wlcore: memset wl->rx_filter_enabled to zero after recovery

Browse source 
zero rx_filter_enabled array after recovery to avoid
cases were the driver will keep trying to clear a
filter which is not configured in FW.

Such case will cause consecutive recoveries due to
command execution failures.

While on it, convert rx_filter_enabled to bitmap,
to save some memory and make sparse happy (it
doesn't like sizeof(bool array)).

Signed-off-by: Nadim Zubidat <nadimz@ti.com>
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Nadim Zubidat 2014-02-10 13:47:17 +02:00 • committed by John W. Linville
parent bb6bd25c08
commit 02d0727ca3
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/net/wireless/ti/wlcore/main.c
View file

@ -1914,6 +1914,7 @@ static void wlcore_op_stop_locked(struct wl1271 *wl)
memset(wl->links_map, 0, sizeof(wl->links_map)); memset(wl->links_map, 0, sizeof(wl->links_map));
memset(wl->roc_map, 0, sizeof(wl->roc_map)); memset(wl->roc_map, 0, sizeof(wl->roc_map));
memset(wl->session_ids, 0, sizeof(wl->session_ids)); memset(wl->session_ids, 0, sizeof(wl->session_ids));
memset(wl->rx_filter_enabled, 0, sizeof(wl->rx_filter_enabled));
wl->active_sta_count = 0; wl->active_sta_count = 0;
wl->active_link_count = 0; wl->active_link_count = 0;

9
drivers/net/wireless/ti/wlcore/rx.c
View file

@ -302,7 +302,7 @@ int wl1271_rx_filter_enable(struct wl1271 *wl,
{ {
int ret; int ret;
if (wl->rx_filter_enabled[index] == enable) { if (!!test_bit(index, wl->rx_filter_enabled) == enable) {
wl1271_warning("Request to enable an already " wl1271_warning("Request to enable an already "
"enabled rx filter %d", index); "enabled rx filter %d", index);
return 0; return 0;
@ -316,7 +316,10 @@ int wl1271_rx_filter_enable(struct wl1271 *wl,
return ret; return ret;
} }
wl->rx_filter_enabled[index] = enable; if (enable)
__set_bit(index, wl->rx_filter_enabled);
else
__clear_bit(index, wl->rx_filter_enabled);
return 0; return 0;
} }
@ -326,7 +329,7 @@ int wl1271_rx_filter_clear_all(struct wl1271 *wl)
int i, ret = 0; int i, ret = 0;
for (i = 0; i < WL1271_MAX_RX_FILTERS; i++) { for (i = 0; i < WL1271_MAX_RX_FILTERS; i++) {
if (!wl->rx_filter_enabled[i]) if (!test_bit(i, wl->rx_filter_enabled))
continue; continue;
ret = wl1271_rx_filter_enable(wl, i, 0, NULL); ret = wl1271_rx_filter_enable(wl, i, 0, NULL);
if (ret) if (ret)

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

@ -451,7 +451,7 @@ struct wl1271 {
size_t fw_status_priv_len; size_t fw_status_priv_len;
/* RX Data filter rule state - enabled/disabled */ /* RX Data filter rule state - enabled/disabled */
bool rx_filter_enabled[WL1271_MAX_RX_FILTERS]; unsigned long rx_filter_enabled[BITS_TO_LONGS(WL1271_MAX_RX_FILTERS)];
/* size of the private static data */ /* size of the private static data */
size_t static_data_priv_len; size_t static_data_priv_len;