From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx1.redhat.com ([209.132.183.28]:1030 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754576Ab0FGKB6 (ORCPT ); Mon, 7 Jun 2010 06:01:58 -0400 From: Stanislaw Gruszka To: stable@kernel.org Cc: Stanislaw Gruszka , Ben Hutchings , linux-wireless@vger.kernel.org Subject: [PATCH 3/4 2.6.33.y] mac80211: do not wip out old supported rates Date: Mon, 7 Jun 2010 12:00:26 +0200 Message-Id: <1275904827-6598-3-git-send-email-sgruszka@redhat.com> In-Reply-To: <1275904827-6598-2-git-send-email-sgruszka@redhat.com> References: <1275904827-6598-1-git-send-email-sgruszka@redhat.com> <1275904827-6598-2-git-send-email-sgruszka@redhat.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: commit f0b058b61711ebf5be94d6865ca7b2c259b71d37 upstream. Use old supported rates, if some buggy AP do not provide supported rates information element in managment frame. Signed-off-by: Stanislaw Gruszka --- net/mac80211/scan.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index bc17cf7..697dc54 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c @@ -60,7 +60,7 @@ ieee80211_bss_info_update(struct ieee80211_local *local, bool beacon) { struct ieee80211_bss *bss; - int clen; + int clen, srlen; s32 signal = 0; if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM) @@ -92,23 +92,24 @@ ieee80211_bss_info_update(struct ieee80211_local *local, if (bss->dtim_period == 0) bss->dtim_period = 1; - 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; -- 1.6.2.5