diff options
| author | Sam Leffler <sam@FreeBSD.org> | 2005-08-10 16:22:30 +0000 |
|---|---|---|
| committer | Sam Leffler <sam@FreeBSD.org> | 2005-08-10 16:22:30 +0000 |
| commit | b5c9941514a11ce20e15aebce59c994fd33b5230 (patch) | |
| tree | b9c0e277abb905c850c4e7b7e0d8615bf32983ff /sys/dev/usb | |
| parent | 44938dbf6d09781698be6fdae1c2e070de44e837 (diff) | |
Notes
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/if_ural.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/dev/usb/if_ural.c b/sys/dev/usb/if_ural.c index 00836523592d..7deb1bc8d368 100644 --- a/sys/dev/usb/if_ural.c +++ b/sys/dev/usb/if_ural.c @@ -722,20 +722,20 @@ ural_task(void *arg) break; case IEEE80211_S_SCAN: - ural_set_chan(sc, ic->ic_bss->ni_chan); + ural_set_chan(sc, ic->ic_curchan); callout_reset(&sc->scan_ch, hz / 5, ural_next_scan, sc); break; case IEEE80211_S_AUTH: - ural_set_chan(sc, ic->ic_bss->ni_chan); + ural_set_chan(sc, ic->ic_curchan); break; case IEEE80211_S_ASSOC: - ural_set_chan(sc, ic->ic_bss->ni_chan); + ural_set_chan(sc, ic->ic_curchan); break; case IEEE80211_S_RUN: - ural_set_chan(sc, ic->ic_bss->ni_chan); + ural_set_chan(sc, ic->ic_curchan); if (ic->ic_opmode != IEEE80211_M_MONITOR) ural_set_bssid(sc, ic->ic_bss->ni_bssid); @@ -1125,7 +1125,7 @@ ural_tx_mgt(struct ural_softc *sc, struct mbuf *m0, struct ieee80211_node *ni) data = &sc->tx_data[0]; desc = (struct ural_tx_desc *)data->buf; - rate = IEEE80211_IS_CHAN_5GHZ(ni->ni_chan) ? 12 : 4; + rate = IEEE80211_IS_CHAN_5GHZ(ic->ic_curchan) ? 12 : 4; if (sc->sc_drvbpf != NULL) { struct ural_tx_radiotap_header *tap = &sc->sc_txtap; @@ -1956,7 +1956,8 @@ ural_init(void *priv) /* set default BSS channel */ ic->ic_bss->ni_chan = ic->ic_ibss_chan; - ural_set_chan(sc, ic->ic_bss->ni_chan); + ic->ic_curchan = ic->ic_ibss_chan; + ural_set_chan(sc, ic->ic_curchan); /* clear statistic registers (STA_CSR0 to STA_CSR10) */ ural_read_multi(sc, RAL_STA_CSR0, sta, sizeof sta); |