diff options
| author | avos <avos@FreeBSD.org> | 2016-03-03 20:06:16 +0000 |
|---|---|---|
| committer | avos <avos@FreeBSD.org> | 2016-03-03 20:06:16 +0000 |
| commit | ea5bbd1d9513db70991ffbe319c71092f3520e1f (patch) | |
| tree | b5637034030e29476f552a3fca011dc9aefb005a /sys/dev/usb/wlan/if_run.c | |
| parent | f70c895e9b372ce94827167ece47502ce5fc1369 (diff) | |
| download | FreeBSD-src-ea5bbd1d9513db70991ffbe319c71092f3520e1f.zip FreeBSD-src-ea5bbd1d9513db70991ffbe319c71092f3520e1f.tar.gz | |
zyd, run, ural: do not corrupt MAC address
Do not use ic_macaddr as a storage for current BSSID;
it may be reused in vap creation procedure;
similar to r288619.
Approved by: adrian (mentor)
Differential Revision: https://reviews.freebsd.org/D5513
Diffstat (limited to 'sys/dev/usb/wlan/if_run.c')
| -rw-r--r-- | sys/dev/usb/wlan/if_run.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/usb/wlan/if_run.c b/sys/dev/usb/wlan/if_run.c index 7a10d2c..fe115ed 100644 --- a/sys/dev/usb/wlan/if_run.c +++ b/sys/dev/usb/wlan/if_run.c @@ -2141,8 +2141,8 @@ run_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) run_set_txpreamble(sc); run_set_basicrates(sc); ni = ieee80211_ref_node(vap->iv_bss); - IEEE80211_ADDR_COPY(ic->ic_macaddr, ni->ni_bssid); - run_set_bssid(sc, ni->ni_bssid); + IEEE80211_ADDR_COPY(sc->sc_bssid, ni->ni_bssid); + run_set_bssid(sc, sc->sc_bssid); ieee80211_free_node(ni); run_enable_tsf_sync(sc); @@ -4811,8 +4811,7 @@ run_scan_end(struct ieee80211com *ic) RUN_LOCK(sc); run_enable_tsf_sync(sc); - /* XXX keep local copy */ - run_set_bssid(sc, ic->ic_macaddr); + run_set_bssid(sc, sc->sc_bssid); RUN_UNLOCK(sc); |
