Commit f0b058b6 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

mac80211: do not wip out old supported rates 



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

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f7f7cc47

net/mac80211/scan.c

+11 −10
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ ieee80211_bss_info_update(struct ieee80211_local *local, 
{

	struct cfg80211_bss *cbss;

	struct ieee80211_bss *bss;

	int clen;

	int clen, srlen;

	s32 signal = 0;



	if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM)
@@ -113,23 +113,24 @@ ieee80211_bss_info_update(struct ieee80211_local *local, 
		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);