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

staging: wfx: drop useless attributes 'filter_prbreq' and 'filter_bssid' 



It is now useless to store filter_prbreq and filter_bssid in struct
wfx_vif. We can just pass them as parameters to hif_set_rx_filter().

Signed-off-by: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200415161147.69738-17-Jerome.Pouiller@silabs.com


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

drivers/staging/wfx/sta.c

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



	// Notes:

	//   - Probe responses (FIF_BCN_PRBRESP_PROMISC) are never filtered
@@ -227,9 +228,9 @@ void wfx_configure_filter(struct ieee80211_hw *hw, 
		wfx_update_filtering(wvif);



		if (*total_flags & FIF_OTHER_BSS)

			wvif->filter_bssid = false;

			filter_bssid = false;

		else

			wvif->filter_bssid = true;

			filter_bssid = true;



		// In AP mode, chip can reply to probe request itself

		if (*total_flags & FIF_PROBE_REQ &&
@@ -239,11 +240,10 @@ void wfx_configure_filter(struct ieee80211_hw *hw, 
		}



		if (*total_flags & FIF_PROBE_REQ)

			wvif->filter_prbreq = false;

			filter_prbreq = false;

		else

			wvif->filter_prbreq = true;

		hif_set_rx_filter(wvif, wvif->filter_bssid,

				  wvif->filter_prbreq);

			filter_prbreq = true;

		hif_set_rx_filter(wvif, filter_bssid, filter_prbreq);



		mutex_unlock(&wvif->scan_lock);

	}

drivers/staging/wfx/wfx.h

+0 −2
Original line number Diff line number Diff line
@@ -90,8 +90,6 @@ struct wfx_vif { 
	int			filter_mcast_count;

	u8			filter_mcast_addr[8][ETH_ALEN];

	bool			filter_mcast;

	bool			filter_bssid;

	bool			filter_prbreq;

	bool			filter_beacon;



	unsigned long		uapsd_mask;