diff options
| author | dyoung <dyoung@NetBSD.org> | 2003-10-17 03:58:23 +0000 |
|---|---|---|
| committer | dyoung <dyoung@NetBSD.org> | 2003-10-17 03:58:23 +0000 |
| commit | 5dca575ce10e4a13480c1931acb06326b88de2b5 (patch) | |
| tree | 76ea428542ed3d8cfc5650deffe73db5ddd4104c /sys/dev/ic | |
| parent | a305f0dedb5377470118a0f511e19309a4f2e8d4 (diff) | |
ieee80211_newstate() wants for ic->ic_state to equal the previous
state, so do not update ic->ic_state in wi_newstate() before calling
ieee80211_newstate(). Instead, update ic->ic_state when we do not
let ieee80211_newstate() run.
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/wi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/ic/wi.c b/sys/dev/ic/wi.c index 052d4fabc32..4ee38389d15 100644 --- a/sys/dev/ic/wi.c +++ b/sys/dev/ic/wi.c @@ -1,4 +1,4 @@ -/* $NetBSD: wi.c,v 1.135 2003/10/16 10:57:35 dyoung Exp $ */ +/* $NetBSD: wi.c,v 1.136 2003/10/17 03:58:23 dyoung Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -70,7 +70,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.135 2003/10/16 10:57:35 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.136 2003/10/17 03:58:23 dyoung Exp $"); #define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */ #define WI_HERMES_STATS_WAR /* Work around stats counter bug. */ @@ -2344,7 +2344,6 @@ wi_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg) ostate = ic->ic_state; DPRINTF(("wi_newstate: %s -> %s\n", stname[ostate], stname[nstate])); - ic->ic_state = nstate; switch (nstate) { case IEEE80211_S_INIT: ic->ic_flags &= ~IEEE80211_F_SIBSS; @@ -2394,6 +2393,7 @@ wi_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg) break; } + ic->ic_state = nstate; /* skip standard ieee80211 handling */ return 0; } |
