wlcore: memset wl->rx_filter_enabled to zero after recovery

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>

diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index b46b3116cc55c1cf129534af6ecf788996ae0cc0..da268e85c3a6af8b0346c32cacd1c39d948935e3 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -1914,6 +1914,7 @@ static void wlcore_op_stop_locked(struct wl1271 *wl)
        memset(wl->links_map, 0, sizeof(wl->links_map));
        memset(wl->roc_map, 0, sizeof(wl->roc_map));
        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_link_count = 0;
 

diff --git a/drivers/net/wireless/ti/wlcore/rx.c b/drivers/net/wireless/ti/wlcore/rx.c
index 6791a1a6afba06702b434b1ae11a196377a0d229..94ab445fde7703eaf2b9e96e928c1a78d592d514 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/rx.c
+++ b/drivers/net/wireless/ti/wlcore/rx.c
@@ -302,7 +302,7 @@ int wl1271_rx_filter_enable(struct wl1271 *wl,
 {
        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 "
                             "enabled rx filter %d", index);
                return 0;
@@ -316,7 +316,10 @@ int wl1271_rx_filter_enable(struct wl1271 *wl,
                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;
 }
@@ -326,7 +329,7 @@ int wl1271_rx_filter_clear_all(struct wl1271 *wl)
        int i, ret = 0;
 
        for (i = 0; i < WL1271_MAX_RX_FILTERS; i++) {
-               if (!wl->rx_filter_enabled[i])
+               if (!test_bit(i, wl->rx_filter_enabled))
                        continue;
                ret = wl1271_rx_filter_enable(wl, i, 0, NULL);
                if (ret)

diff --git a/drivers/net/wireless/ti/wlcore/wlcore.h b/drivers/net/wireless/ti/wlcore/wlcore.h
index 06efc12a39e5175dfde449843ffbb5a7c50b157d..a3cc11740c883eea62386291d08109be408bb5a4 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/wlcore.h
+++ b/drivers/net/wireless/ti/wlcore/wlcore.h
@@ -451,7 +451,7 @@ struct wl1271 {
        size_t fw_status_priv_len;
 
        /* 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_t static_data_priv_len;