lkml.org 
[lkml]   [2019]   [Dec]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 29/55] staging: wfx: simplify handling of tx_lock in wfx_do_join()
    Date
    From: Jérôme Pouiller <jerome.pouiller@silabs.com>

    In the old days, wfx_do_join() could be called from different contexts.
    Now that wfx_do_join() is called only from one place, it is cleaner to
    keep lock and unlock of data inside the function.

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

    diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c
    index 939c64f108ed..62e65493a4fe 100644
    --- a/drivers/staging/wfx/sta.c
    +++ b/drivers/staging/wfx/sta.c
    @@ -644,7 +644,6 @@ static void wfx_set_mfp(struct wfx_vif *wvif,
    hif_set_mfp(wvif, mfpc, mfpr);
    }

    -/* MUST be called with tx_lock held! It will be unlocked for us. */
    static void wfx_do_join(struct wfx_vif *wvif)
    {
    const u8 *bssid;
    @@ -659,6 +658,8 @@ static void wfx_do_join(struct wfx_vif *wvif)
    conf->basic_rates),
    };

    + wfx_tx_lock_flush(wvif->wdev);
    +
    if (wvif->channel->flags & IEEE80211_CHAN_NO_IR)
    join.probe_for_join = 0;

    @@ -1180,10 +1181,8 @@ void wfx_bss_info_changed(struct ieee80211_hw *hw,
    }
    mutex_unlock(&wdev->conf_mutex);

    - if (do_join) {
    - wfx_tx_lock_flush(wdev);
    - wfx_do_join(wvif); /* Will unlock it for us */
    - }
    + if (do_join)
    + wfx_do_join(wvif);
    }

    static void wfx_ps_notify(struct wfx_vif *wvif, enum sta_notify_cmd notify_cmd,
    --
    2.24.0
    \
     
     \ /
      Last update: 2019-12-17 17:16    [W:4.418 / U:0.600 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site