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

Fix comment about ipw_assoc and remove some whitespaces; no functional

Browse Source 
changes.

Approved by:	rpaulo (mentor)
This commit is contained in:
Bernhard Schmidt 2010-04-17 18:13:52 +00:00
parent 0b6ace4743
commit d02ae91a4c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/ipw/if_ipw.c
View File

@ -888,10 +888,10 @@ ipw_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
/* /*
* XXX when joining an ibss network we are called * XXX when joining an ibss network we are called
* with a SCAN -> RUN transition on scan complete. * with a SCAN -> RUN transition on scan complete.
* Use that to call ipw_auth_and_assoc. On completing * Use that to call ipw_assoc. On completing the
* the join we are then called again with an * join we are then called again with an AUTH -> RUN
* AUTH -> RUN transition and we want to do nothing. * transition and we want to do nothing. This is
* This is all totally bogus and needs to be redone. * all totally bogus and needs to be redone.
*/ */
if (ostate == IEEE80211_S_SCAN) if (ostate == IEEE80211_S_SCAN)
ipw_assoc(ic, vap); ipw_assoc(ic, vap);
@ -909,7 +909,7 @@ ipw_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
case IEEE80211_S_ASSOC: case IEEE80211_S_ASSOC:
/* /*
* If we are not transitioning from AUTH the resend the * If we are not transitioning from AUTH then resend the
* association request. * association request.
*/ */
if (ostate != IEEE80211_S_AUTH) if (ostate != IEEE80211_S_AUTH)
@ -1070,7 +1070,7 @@ ipw_rx_newstate_intr(struct ipw_softc *sc, struct ipw_soft_buf *sbuf)
case IPW_STATE_DISABLED: case IPW_STATE_DISABLED:
/* XXX? is this right? */ /* XXX? is this right? */
sc->flags &= ~(IPW_FLAG_HACK | IPW_FLAG_SCANNING | sc->flags &= ~(IPW_FLAG_HACK | IPW_FLAG_SCANNING |
IPW_FLAG_ASSOCIATING | IPW_FLAG_ASSOCIATED); IPW_FLAG_ASSOCIATING | IPW_FLAG_ASSOCIATED);
DPRINTFN(2, ("Firmware disabled (%s flags 0x%x)\n", DPRINTFN(2, ("Firmware disabled (%s flags 0x%x)\n",
IEEESTATE(vap), sc->flags)); IEEESTATE(vap), sc->flags));