lkml.org 
[lkml]   [2010]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[046/205] mac80211: do not wip out old supported rates
    2.6.34-stable review patch.  If anyone has any objections, please let us know.

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

    From: Stanislaw Gruszka <sgruszka@redhat.com>

    commit f0b058b61711ebf5be94d6865ca7b2c259b71d37 upstream.

    Use old supported rates, if AP do not provide supported rates
    information element in a new managment frame.

    Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    net/mac80211/scan.c | 21 +++++++++++----------
    1 file changed, 11 insertions(+), 10 deletions(-)

    --- a/net/mac80211/scan.c
    +++ b/net/mac80211/scan.c
    @@ -83,7 +83,7 @@ ieee80211_bss_info_update(struct ieee802
    {
    struct cfg80211_bss *cbss;
    struct ieee80211_bss *bss;
    - int clen;
    + int clen, srlen;
    s32 signal = 0;

    if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM)
    @@ -112,23 +112,24 @@ ieee80211_bss_info_update(struct ieee802
    bss->dtim_period = tim_ie->dtim_period;
    }

    - bss->supp_rates_len = 0;
    + /* replace old supported rates if we get new values */
    + srlen = 0;
    if (elems->supp_rates) {
    - clen = IEEE80211_MAX_SUPP_RATES - bss->supp_rates_len;
    + clen = IEEE80211_MAX_SUPP_RATES;
    if (clen > elems->supp_rates_len)
    clen = elems->supp_rates_len;
    - memcpy(&bss->supp_rates[bss->supp_rates_len], elems->supp_rates,
    - clen);
    - bss->supp_rates_len += clen;
    + memcpy(bss->supp_rates, elems->supp_rates, clen);
    + srlen += clen;
    }
    if (elems->ext_supp_rates) {
    - clen = IEEE80211_MAX_SUPP_RATES - bss->supp_rates_len;
    + clen = IEEE80211_MAX_SUPP_RATES - srlen;
    if (clen > elems->ext_supp_rates_len)
    clen = elems->ext_supp_rates_len;
    - memcpy(&bss->supp_rates[bss->supp_rates_len],
    - elems->ext_supp_rates, clen);
    - bss->supp_rates_len += clen;
    + memcpy(bss->supp_rates + srlen, elems->ext_supp_rates, clen);
    + srlen += clen;
    }
    + if (srlen)
    + bss->supp_rates_len = srlen;

    bss->wmm_used = elems->wmm_param || elems->wmm_info;
    bss->uapsd_supported = is_uapsd_supported(elems);



    \
     
     \ /
      Last update: 2010-07-30 19:59    [W:4.086 / U:0.492 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site