From: Jérôme Pouiller Date: Wed, 15 Apr 2020 16:11:38 +0000 (+0200) Subject: staging: wfx: drop useless wfx_fwd_probe_req() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=824f830fc0943e91bbce44799e76dc50e1fbdad2;p=linux.git staging: wfx: drop useless wfx_fwd_probe_req() wfx_fwd_probe_req() is a function of two lines called from only one place. In order to uniformize all filtering functions, drop wfx_fwd_probe_req(). Signed-off-by: Jérôme Pouiller Link: https://lore.kernel.org/r/20200415161147.69738-12-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 b785b1b7d5836..8d2365a2e35bc 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -113,13 +113,6 @@ end: mutex_unlock(&wvif->bss_loss_lock); } -int wfx_fwd_probe_req(struct wfx_vif *wvif, bool enable) -{ - wvif->fwd_probe_req = enable; - return hif_set_rx_filter(wvif, wvif->filter_bssid, - wvif->fwd_probe_req); -} - void wfx_update_filtering(struct wfx_vif *wvif) { int i; @@ -249,9 +242,12 @@ void wfx_configure_filter(struct ieee80211_hw *hw, } if (*total_flags & FIF_PROBE_REQ) - wfx_fwd_probe_req(wvif, true); + wvif->fwd_probe_req = true; else - wfx_fwd_probe_req(wvif, false); + wvif->fwd_probe_req = false; + hif_set_rx_filter(wvif, wvif->filter_bssid, + wvif->fwd_probe_req); + mutex_unlock(&wvif->scan_lock); } mutex_unlock(&wdev->conf_mutex); diff --git a/drivers/staging/wfx/sta.h b/drivers/staging/wfx/sta.h index 8d76fba5f5044..a90eaf5043a81 100644 --- a/drivers/staging/wfx/sta.h +++ b/drivers/staging/wfx/sta.h @@ -88,7 +88,6 @@ void wfx_suspend_resume_mc(struct wfx_vif *wvif, enum sta_notify_cmd cmd); // Other Helpers void wfx_cqm_bssloss_sm(struct wfx_vif *wvif, int init, int good, int bad); -int wfx_fwd_probe_req(struct wfx_vif *wvif, bool enable); u32 wfx_rate_mask_to_hw(struct wfx_dev *wdev, u32 rates); #endif /* WFX_STA_H */