kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: wfx: simplify wfx_update_beaconing()

Browse source 
Remove most of indentation of wfx_update_beaconing() by reworking the
error handling.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200115135338.14374-19-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jérôme Pouiller 2020-01-15 13:54:27 +00:00 • committed by Greg Kroah-Hartman
parent 305f710995
commit 0b2b0595ce
1 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

28
drivers/staging/wfx/sta.c
View file

@ -760,23 +760,17 @@ static int wfx_start_ap(struct wfx_vif *wvif)
static int wfx_update_beaconing(struct wfx_vif *wvif)
{
struct ieee80211_bss_conf *conf = &wvif->vif->bss_conf;
if (wvif->vif->type == NL80211_IFTYPE_AP) {
/* TODO: check if changed channel, band */
if (wvif->state != WFX_STATE_AP ||
wvif->beacon_int != conf->beacon_int) {
wfx_tx_lock_flush(wvif->wdev);
if (wvif->state != WFX_STATE_PASSIVE) {
hif_reset(wvif, false);
wfx_tx_policy_init(wvif);
}
wvif->state = WFX_STATE_PASSIVE;
wfx_start_ap(wvif);
wfx_tx_unlock(wvif->wdev);
} else {
}
}
if (wvif->vif->type != NL80211_IFTYPE_AP)
return 0;
if (wvif->state == WFX_STATE_AP &&
wvif->beacon_int == wvif->vif->bss_conf.beacon_int)
return 0;
wfx_tx_lock_flush(wvif->wdev);
hif_reset(wvif, false);
wfx_tx_policy_init(wvif);
wvif->state = WFX_STATE_PASSIVE;
wfx_start_ap(wvif);
wfx_tx_unlock(wvif->wdev);
return 0;
}