diff mbox series

[16/20] staging: wfx: drop useless attributes 'filter_prbreq' and 'filter_bssid'

Message ID 20200415161147.69738-17-Jerome.Pouiller@silabs.com
State New
Headers show
Series staging: wfx: simplify filtering | expand

Commit Message

Jérôme Pouiller April 15, 2020, 4:11 p.m. UTC 
From: Jérôme Pouiller <jerome.pouiller@silabs.com>

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: Jérôme Pouiller <jerome.pouiller@silabs.com>
---
 drivers/staging/wfx/sta.c | 12 ++++++------
 drivers/staging/wfx/wfx.h |  2 --
 2 files changed, 6 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c
index c7505b5d0947..a9261ef4b4c5 100644
--- a/drivers/staging/wfx/sta.c
+++ b/drivers/staging/wfx/sta.c
@@ -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);
 	}
diff --git a/drivers/staging/wfx/wfx.h b/drivers/staging/wfx/wfx.h
index 53184fe2da4b..310d95478824 100644
--- a/drivers/staging/wfx/wfx.h
+++ b/drivers/staging/wfx/wfx.h
@@ -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;