From c801351a9d4587aab131d018330d4b35a0b3cdcf Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Wed, 15 Apr 2020 18:11:46 +0200 Subject: [PATCH] staging: wfx: drop useless attribute 'filter_mcast' MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Currently, wfx_update_filtering() apply the value of wvif->filter_mcast to the hardware. But an attentive reader will note that wfx_update_filtering() is always called after set wvif->filter_mcast. Thus, it not necessary to store filter_mcast in the struct wfx_vif. We can just pass it as parameter. Also rename wfx_update_filtering() in wfx_filter_mcast() to reflect this change. Signed-off-by: Jérôme Pouiller Link: https://lore.kernel.org/r/20200415161147.69738-20-Jerome.Pouiller@silabs.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wfx/sta.c | 14 +++++++------- drivers/staging/wfx/wfx.h | 1 - 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index 69a5823..c73dbb3 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -144,7 +144,7 @@ static void wfx_filter_beacon(struct wfx_vif *wvif, bool filter_beacon) } } -void wfx_update_filtering(struct wfx_vif *wvif) +static void wfx_filter_mcast(struct wfx_vif *wvif, bool filter_mcast) { int i; @@ -152,7 +152,7 @@ void wfx_update_filtering(struct wfx_vif *wvif) hif_set_data_filtering(wvif, false, true); return; - if (!wvif->filter_mcast) { + if (!filter_mcast) { hif_set_data_filtering(wvif, false, true); return; } @@ -198,7 +198,7 @@ void wfx_configure_filter(struct ieee80211_hw *hw, { struct wfx_vif *wvif = NULL; struct wfx_dev *wdev = hw->priv; - bool filter_bssid, filter_prbreq, filter_beacon; + bool filter_bssid, filter_prbreq, filter_beacon, filter_mcast; // Notes: // - Probe responses (FIF_BCN_PRBRESP_PROMISC) are never filtered @@ -223,14 +223,14 @@ void wfx_configure_filter(struct ieee80211_hw *hw, wfx_filter_beacon(wvif, filter_beacon); if (*total_flags & FIF_ALLMULTI) { - wvif->filter_mcast = false; + filter_mcast = false; } else if (!wvif->filter_mcast_count) { dev_dbg(wdev->dev, "disabling unconfigured multicast filter"); - wvif->filter_mcast = false; + filter_mcast = false; } else { - wvif->filter_mcast = true; + filter_mcast = true; } - wfx_update_filtering(wvif); + wfx_filter_mcast(wvif, filter_mcast); if (*total_flags & FIF_OTHER_BSS) filter_bssid = false; diff --git a/drivers/staging/wfx/wfx.h b/drivers/staging/wfx/wfx.h index c30e698..b5d2d0f 100644 --- a/drivers/staging/wfx/wfx.h +++ b/drivers/staging/wfx/wfx.h @@ -89,7 +89,6 @@ struct wfx_vif { int filter_mcast_count; u8 filter_mcast_addr[8][ETH_ALEN]; - bool filter_mcast; unsigned long uapsd_mask; struct hif_req_set_bss_params bss_params; -- 2.7.4