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

staging: wfx: remove unnecessary conditions in wfx_bss_info_changed() 



wfx_bss_info_changed() update ERP and CQM related stuff. Thus, it check
the flags BSS_CHANGED_ERP_* and BSS_CHANGED_CQM.

It also update ERP and CQM on join and leave by checking the flag
BSS_CHANGED_ASSOC. This check is useless. Mac80211 already do that job
and set necessary flags as expected.

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


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

drivers/staging/wfx/sta.c

+3 −4
Original line number Diff line number Diff line
@@ -725,8 +725,7 @@ void wfx_bss_info_changed(struct ieee80211_hw *hw, 
		hif_keep_alive_period(wvif, info->max_idle_period *

					    USEC_PER_TU / USEC_PER_MSEC);



	if (changed & BSS_CHANGED_ASSOC ||

	    changed & BSS_CHANGED_ERP_CTS_PROT ||

	if (changed & BSS_CHANGED_ERP_CTS_PROT ||

	    changed & BSS_CHANGED_ERP_PREAMBLE) {

		u8 erp_ie[3] = { WLAN_EID_ERP_INFO, 1, 0 };
@@ -739,10 +738,10 @@ void wfx_bss_info_changed(struct ieee80211_hw *hw, 
			hif_update_ie_beacon(wvif, erp_ie, sizeof(erp_ie));

	}



	if (changed & BSS_CHANGED_ASSOC || changed & BSS_CHANGED_ERP_SLOT)

	if (changed & BSS_CHANGED_ERP_SLOT)

		hif_slot_time(wvif, info->use_short_slot ? 9 : 20);



	if (changed & BSS_CHANGED_ASSOC || changed & BSS_CHANGED_CQM)

	if (changed & BSS_CHANGED_CQM)

		hif_set_rcpi_rssi_threshold(wvif, info->cqm_rssi_thold,

					    info->cqm_rssi_hyst);