staging: wfx: re-enable BA after reset

Firmware does not support Block Acks when multiple vif are running.
Thus, wfx_add_interface() and wfx_remove_interface() enable and disable
Block Acks as necessary.

Block Ack policy is also reset after hif_reset(). Driver have to
re-enable it after each call to hif_reset().

This patch reflects this behavior.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200410133239.438347-17-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c
index 21eceaf..91b4ce9 100644 (file)
--- a/drivers/staging/wfx/sta.c
+++ b/drivers/staging/wfx/sta.c
@@ -416,13 +416,12 @@ static void wfx_do_unjoin(struct wfx_vif *wvif)
        hif_reset(wvif, false);
        wfx_tx_policy_init(wvif);
        hif_set_macaddr(wvif, wvif->vif->addr);
+       if (wvif_count(wvif->wdev) <= 1)
+               hif_set_block_ack_policy(wvif, 0xFF, 0xFF);
        wfx_free_event_queue(wvif);
        cancel_work_sync(&wvif->event_handler_work);
        wfx_cqm_bssloss_sm(wvif, 0, 0, 0);
 
-       /* Disable Block ACKs */
-       hif_set_block_ack_policy(wvif, 0, 0);
-
        wvif->disable_beacon_filter = false;
        wfx_update_filtering(wvif);
        memset(&wvif->bss_params, 0, sizeof(wvif->bss_params));
@@ -492,9 +491,6 @@ static void wfx_do_join(struct wfx_vif *wvif)
        }
        rcu_read_unlock();
 
-       if (wvif_count(wvif->wdev) <= 1)
-               hif_set_block_ack_policy(wvif, 0xFF, 0xFF);
-
        wfx_set_mfp(wvif, bss);
        cfg80211_put_bss(wvif->wdev->hw->wiphy, bss);
 
@@ -591,8 +587,6 @@ int wfx_start_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
        struct wfx_vif *wvif = (struct wfx_vif *)vif->drv_priv;
 
        wfx_upload_keys(wvif);
-       if (wvif_count(wvif->wdev) <= 1)
-               hif_set_block_ack_policy(wvif, 0xFF, 0xFF);
        wvif->state = WFX_STATE_AP;
        wfx_update_filtering(wvif);
        wfx_upload_ap_templates(wvif);
@@ -607,6 +601,8 @@ void wfx_stop_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
 
        hif_reset(wvif, false);
        wfx_tx_policy_init(wvif);
+       if (wvif_count(wvif->wdev) <= 1)
+               hif_set_block_ack_policy(wvif, 0xFF, 0xFF);
        wvif->state = WFX_STATE_PASSIVE;
 }