d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix handling of the current channel (missed in previous commit)

Browse Source
This commit is contained in:
sam 2005-08-13 00:30:26 +00:00
parent a11b2e92bd
commit f816a6040d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/awi/awi.c
View File

@ -691,6 +691,7 @@ awi_init(struct ifnet *ifp)
} else {
/* XXX check sc->sc_cur_chan */
ni->ni_chan = &ic->ic_channels[sc->sc_cur_chan];
ic->ic_curchan = ni->ni_chan;
ieee80211_new_state(ic, IEEE80211_S_SCAN, -1);
}
return 0;
@ -1973,19 +1974,19 @@ awi_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg)
if (sc->sc_mib_phy.IEEE_PHY_Type == AWI_PHY_TYPE_FH) {
awi_write_1(sc, AWI_CA_SCAN_SET,
IEEE80211_FH_CHANSET(
ieee80211_chan2ieee(ic, ni->ni_chan)));
ieee80211_chan2ieee(ic, ic->ic_curchan)));
awi_write_1(sc, AWI_CA_SCAN_PATTERN,
IEEE80211_FH_CHANPAT(
ieee80211_chan2ieee(ic, ni->ni_chan)));
ieee80211_chan2ieee(ic, ic->ic_curchan)));
awi_write_1(sc, AWI_CA_SCAN_IDX, 1);
} else {
awi_write_1(sc, AWI_CA_SCAN_SET,
ieee80211_chan2ieee(ic, ni->ni_chan));
ieee80211_chan2ieee(ic, ic->ic_curchan));
awi_write_1(sc, AWI_CA_SCAN_PATTERN, 0);
awi_write_1(sc, AWI_CA_SCAN_IDX, 0);
}
awi_write_1(sc, AWI_CA_SCAN_SUSP, 0);
sc->sc_cur_chan = ieee80211_chan2ieee(ic, ni->ni_chan);
sc->sc_cur_chan = ieee80211_chan2ieee(ic, ic->ic_curchan);
if ((error = awi_cmd(sc, AWI_CMD_SCAN, AWI_NOWAIT))
!= 0)
break;