Commit c801351a authored by Jérôme Pouiller's avatar Jérôme Pouiller Committed by Greg Kroah-Hartman
Browse files

staging: wfx: drop useless attribute 'filter_mcast' 



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: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200415161147.69738-20-Jerome.Pouiller@silabs.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b15973f3

drivers/staging/wfx/sta.c

+7 −7
Original line number Diff line number Diff line
@@ -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;

drivers/staging/wfx/wfx.h

+0 −1
Original line number Diff line number Diff line
@@ -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;