Page MenuHomeFreeBSD
Files F164279917

D5513.id13951.diff
No OneTemporary
Actions

D5513.id13951.diff
View Options

Index: sys/dev/usb/wlan/if_run.c
===================================================================
--- sys/dev/usb/wlan/if_run.c
+++ sys/dev/usb/wlan/if_run.c
@@ -2141,8 +2141,8 @@
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);
@@ -4810,8 +4810,7 @@
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);
Index: sys/dev/usb/wlan/if_runvar.h
===================================================================
--- sys/dev/usb/wlan/if_runvar.h
+++ sys/dev/usb/wlan/if_runvar.h
@@ -246,6 +246,8 @@
uint8_t rvp_bmap;
uint8_t sc_detached;
+ uint8_t sc_bssid[IEEE80211_ADDR_LEN];
+
union {
struct run_rx_radiotap_header th;
uint8_t pad[64];
Index: sys/dev/usb/wlan/if_ural.c
===================================================================
--- sys/dev/usb/wlan/if_ural.c
+++ sys/dev/usb/wlan/if_ural.c
@@ -706,8 +706,8 @@
ural_update_slot(sc);
ural_set_txpreamble(sc);
ural_set_basicrates(sc, ic->ic_bsschan);
- IEEE80211_ADDR_COPY(ic->ic_macaddr, ni->ni_bssid);
- ural_set_bssid(sc, ic->ic_macaddr);
+ IEEE80211_ADDR_COPY(sc->sc_bssid, ni->ni_bssid);
+ ural_set_bssid(sc, sc->sc_bssid);
}
if (vap->iv_opmode == IEEE80211_M_HOSTAP ||
@@ -1581,7 +1581,7 @@
RAL_LOCK(sc);
ural_enable_tsf_sync(sc);
- ural_set_bssid(sc, ic->ic_macaddr);
+ ural_set_bssid(sc, sc->sc_bssid);
RAL_UNLOCK(sc);
}
Index: sys/dev/usb/wlan/if_uralvar.h
===================================================================
--- sys/dev/usb/wlan/if_uralvar.h
+++ sys/dev/usb/wlan/if_uralvar.h
@@ -97,7 +97,7 @@
uint32_t asic_rev;
uint8_t rf_rev;
- struct usb_xfer *sc_xfer[URAL_N_TRANSFER];
+ struct usb_xfer *sc_xfer[URAL_N_TRANSFER];
struct ural_tx_data tx_data[RAL_TX_LIST_COUNT];
ural_txdhead tx_q;
@@ -113,6 +113,8 @@
u_int sc_detached:1,
sc_running:1;
+ uint8_t sc_bssid[IEEE80211_ADDR_LEN];
+
struct {
uint8_t val;
uint8_t reg;
Index: sys/dev/usb/wlan/if_zyd.c
===================================================================
--- sys/dev/usb/wlan/if_zyd.c
+++ sys/dev/usb/wlan/if_zyd.c
@@ -609,8 +609,8 @@
/* make data LED blink upon Tx */
zyd_write32_m(sc, sc->sc_fwbase + ZYD_FW_LINK_STATUS, 1);
- IEEE80211_ADDR_COPY(ic->ic_macaddr, vap->iv_bss->ni_bssid);
- zyd_set_bssid(sc, ic->ic_macaddr);
+ IEEE80211_ADDR_COPY(sc->sc_bssid, vap->iv_bss->ni_bssid);
+ zyd_set_bssid(sc, sc->sc_bssid);
break;
default:
break;
@@ -2859,7 +2859,7 @@
ZYD_LOCK(sc);
/* restore previous bssid */
- zyd_set_bssid(sc, ic->ic_macaddr);
+ zyd_set_bssid(sc, sc->sc_bssid);
ZYD_UNLOCK(sc);
}
Index: sys/dev/usb/wlan/if_zydreg.h
===================================================================
--- sys/dev/usb/wlan/if_zydreg.h
+++ sys/dev/usb/wlan/if_zydreg.h
@@ -1291,6 +1291,7 @@
uint8_t sc_ofdm36_cal[14];
uint8_t sc_ofdm48_cal[14];
uint8_t sc_ofdm54_cal[14];
+ uint8_t sc_bssid[IEEE80211_ADDR_LEN];
struct mtx sc_mtx;
struct zyd_tx_data tx_data[ZYD_TX_LIST_CNT];

File Metadata

Mime Type
text/plain
Expires
Fri, Jul 31, 8:26 AM (14 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35777391
Default Alt Text
D5513.id13951.diff (3 KB)

Event Timeline