lkml.org 
[lkml]   [2020]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 18/65] staging: wfx: simplify wfx_update_beaconing()
    Date
    From: Jérôme Pouiller <jerome.pouiller@silabs.com>

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

    Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
    ---
    drivers/staging/wfx/sta.c | 28 +++++++++++-----------------
    1 file changed, 11 insertions(+), 17 deletions(-)

    diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c
    index 1181203489f0..0c73691ab736 100644
    --- a/drivers/staging/wfx/sta.c
    +++ b/drivers/staging/wfx/sta.c
    @@ -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;
    }

    --
    2.25.0
    \
     
     \ /
      Last update: 2020-01-15 13:19    [W:5.547 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site