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

staging: wfx: drop wvif->cqm_rssi_thold

Current code keeps a copy of bss_conf->cqm_rssi_thold in wfx_vif. There
is no sane reason for that.
Signed-off-by: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200115135338.14374-25-Jerome.Pouiller@silabs.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9d443ffc
...@@ -377,7 +377,7 @@ static void wfx_event_report_rssi(struct wfx_vif *wvif, u8 raw_rcpi_rssi) ...@@ -377,7 +377,7 @@ static void wfx_event_report_rssi(struct wfx_vif *wvif, u8 raw_rcpi_rssi)
int cqm_evt; int cqm_evt;
rcpi_rssi = raw_rcpi_rssi / 2 - 110; rcpi_rssi = raw_rcpi_rssi / 2 - 110;
if (rcpi_rssi <= wvif->cqm_rssi_thold) if (rcpi_rssi <= wvif->vif->bss_conf.cqm_rssi_thold)
cqm_evt = NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW; cqm_evt = NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW;
else else
cqm_evt = NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH; cqm_evt = NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH;
...@@ -922,11 +922,9 @@ void wfx_bss_info_changed(struct ieee80211_hw *hw, ...@@ -922,11 +922,9 @@ void wfx_bss_info_changed(struct ieee80211_hw *hw,
if (changed & BSS_CHANGED_ASSOC || changed & BSS_CHANGED_ERP_SLOT) if (changed & BSS_CHANGED_ASSOC || changed & BSS_CHANGED_ERP_SLOT)
hif_slot_time(wvif, info->use_short_slot ? 9 : 20); hif_slot_time(wvif, info->use_short_slot ? 9 : 20);
if (changed & BSS_CHANGED_ASSOC || changed & BSS_CHANGED_CQM) { if (changed & BSS_CHANGED_ASSOC || changed & BSS_CHANGED_CQM)
wvif->cqm_rssi_thold = info->cqm_rssi_thold;
hif_set_rcpi_rssi_threshold(wvif, info->cqm_rssi_thold, hif_set_rcpi_rssi_threshold(wvif, info->cqm_rssi_thold,
info->cqm_rssi_hyst); info->cqm_rssi_hyst);
}
if (changed & BSS_CHANGED_TXPOWER) if (changed & BSS_CHANGED_TXPOWER)
hif_set_output_power(wvif, info->txpower); hif_set_output_power(wvif, info->txpower);
......
...@@ -105,7 +105,6 @@ struct wfx_vif { ...@@ -105,7 +105,6 @@ struct wfx_vif {
struct work_struct update_filtering_work; struct work_struct update_filtering_work;
u32 erp_info; u32 erp_info;
int cqm_rssi_thold;
bool setbssparams_done; bool setbssparams_done;
unsigned long uapsd_mask; unsigned long uapsd_mask;
struct ieee80211_tx_queue_params edca_params[IEEE80211_NUM_ACS]; struct ieee80211_tx_queue_params edca_params[IEEE80211_NUM_ACS];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment