lkml.org 
[lkml]   [2015]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 040/102] staging: vt6655: vnt_bss_info_changed check conf->beacon_rate is not NULL
    Date
    3.19.8-ckt7 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Malcolm Priestley <tvboxspy@gmail.com>

    commit 1f17124006b65482d9084c01e252b59dbca8db8f upstream.

    conf->beacon_rate can be NULL on association. So check conf->beacon_rate

    BSS_CHANGED_BEACON_INFO needs to flagged in changed as the beacon_rate
    will appear later.

    Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/staging/vt6655/device_main.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
    index 4968d8a..2e5de62 100644
    --- a/drivers/staging/vt6655/device_main.c
    +++ b/drivers/staging/vt6655/device_main.c
    @@ -1516,8 +1516,9 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw,
    }
    }

    - if (changed & BSS_CHANGED_ASSOC && priv->op_mode != NL80211_IFTYPE_AP) {
    - if (conf->assoc) {
    + if (changed & (BSS_CHANGED_ASSOC | BSS_CHANGED_BEACON_INFO) &&
    + priv->op_mode != NL80211_IFTYPE_AP) {
    + if (conf->assoc && conf->beacon_rate) {
    CARDbUpdateTSF(priv, conf->beacon_rate->hw_value,
    conf->sync_device_ts, conf->sync_tsf);

    --
    1.9.1


    \
     
     \ /
      Last update: 2015-09-22 20:41    [W:4.054 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site