From: Jérôme Pouiller Date: Fri, 15 May 2020 08:33:18 +0000 (+0200) Subject: staging: wfx: merge wfx_stop_ap() with wfx_reset() X-Git-Tag: locking-urgent-2020-06-11~55^2~73 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b3a71adf4d580b6382944e2c2ead392ba65e5243;p=users%2Fdwmw2%2Flinux.git staging: wfx: merge wfx_stop_ap() with wfx_reset() wfx_stop_ap() and wfx_reset() do the same thing. Merge them. Signed-off-by: Jérôme Pouiller Link: https://lore.kernel.org/r/20200515083325.378539-13-Jerome.Pouiller@silabs.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index e077f42b62dcb..7d9f680ca53a3 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -479,11 +479,7 @@ void wfx_stop_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif) { struct wfx_vif *wvif = (struct wfx_vif *)vif->drv_priv; - hif_reset(wvif, false); - wfx_tx_policy_init(wvif); - if (wvif_count(wvif->wdev) <= 1) - hif_set_block_ack_policy(wvif, 0xFF, 0xFF); - wvif->bss_not_support_ps_poll = false; + wfx_reset(wvif); } static void wfx_join_finalize(struct wfx_vif *wvif,