lkml.org 
[lkml]   [2015]   [Jul]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.1 225/267] mac80211: fix the beacon csa counter for mesh and ibss
    Date
    4.1-stable review patch.  If anyone has any objections, please let me know.

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

    From: Chun-Yeow Yeoh <yeohchunyeow@gmail.com>

    commit 8df734e865b74d9f273216482a45a38269dc767a upstream.

    The csa counter has moved from sdata to beacon/presp but
    it is not updated accordingly for mesh and ibss. Fix this.

    Fixes: af296bdb8da4 ("mac80211: move csa counters from sdata to beacon/presp")
    Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/mac80211/cfg.c | 1 +
    net/mac80211/ibss.c | 1 +
    net/mac80211/mesh.c | 1 +
    3 files changed, 3 insertions(+)

    --- a/net/mac80211/cfg.c
    +++ b/net/mac80211/cfg.c
    @@ -3356,6 +3356,7 @@ static int ieee80211_mgmt_tx(struct wiph
    /* Update CSA counters */
    if (sdata->vif.csa_active &&
    (sdata->vif.type == NL80211_IFTYPE_AP ||
    + sdata->vif.type == NL80211_IFTYPE_MESH_POINT ||
    sdata->vif.type == NL80211_IFTYPE_ADHOC) &&
    params->n_csa_offsets) {
    int i;
    --- a/net/mac80211/ibss.c
    +++ b/net/mac80211/ibss.c
    @@ -146,6 +146,7 @@ ieee80211_ibss_build_presp(struct ieee80
    csa_settings->chandef.chan->center_freq);
    presp->csa_counter_offsets[0] = (pos - presp->head);
    *pos++ = csa_settings->count;
    + presp->csa_current_counter = csa_settings->count;
    }

    /* put the remaining rates in WLAN_EID_EXT_SUPP_RATES */
    --- a/net/mac80211/mesh.c
    +++ b/net/mac80211/mesh.c
    @@ -680,6 +680,7 @@ ieee80211_mesh_build_beacon(struct ieee8
    *pos++ = 0x0;
    *pos++ = ieee80211_frequency_to_channel(
    csa->settings.chandef.chan->center_freq);
    + bcn->csa_current_counter = csa->settings.count;
    bcn->csa_counter_offsets[0] = hdr_len + 6;
    *pos++ = csa->settings.count;
    *pos++ = WLAN_EID_CHAN_SWITCH_PARAM;



    \
     
     \ /
      Last update: 2015-07-31 23:41    [W:3.348 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site