--- net/mac80211/scan.c

+++ net/mac80211/scan.c

@@ -62,7 +62,7 @@ ieee80211_bss_info_update(struct ieee802

bool beacon)

{

struct ieee80211_bss *bss;

- int clen;

+ int clen, srlen;

s32 signal = 0;

if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM)

@@ -94,23 +94,24 @@ ieee80211_bss_info_update(struct ieee802

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;

@@ -408,6 +409,16 @@ static int __ieee80211_start_scan(struct

if (local->scan_req)

return -EBUSY;

+ if (req != local->int_scan_req &&

+ sdata->vif.type == NL80211_IFTYPE_STATION &&

+ !list_empty(&ifmgd->work_list)) {

+ /* actually wait for the work it's doing to finish/time out */

+ set_bit(IEEE80211_STA_REQ_SCAN, &ifmgd->request);

+ local->scan_req = req;

+ local->scan_sdata = sdata;

+ return 0;

+ }

+

if (local->ops->hw_scan) {

u8 *ies;

int ielen;

@@ -428,14 +439,6 @@ static int __ieee80211_start_scan(struct

local->scan_req = req;

local->scan_sdata = sdata;

- if (req != local->int_scan_req &&

- sdata->vif.type == NL80211_IFTYPE_STATION &&

- !list_empty(&ifmgd->work_list)) {

- /* actually wait for the work it's doing to finish/time out */

- set_bit(IEEE80211_STA_REQ_SCAN, &ifmgd->request);

- return 0;

- }

-

if (local->ops->hw_scan)

__set_bit(SCAN_HW_SCANNING, &local->scanning);

else