diff options
| author | sam <sam@FreeBSD.org> | 2007-11-02 05:11:45 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2007-11-02 05:11:45 +0000 |
| commit | bea2dd5a061bf4e23b170c12c52f0e02f56c2aa6 (patch) | |
| tree | 199678951f70765343bf4befa30844ff55662d4b /sys/net80211/ieee80211_proto.c | |
| parent | f39a9d39ee83c56f0b22596acd66a9bb0416abf6 (diff) | |
| download | FreeBSD-src-bea2dd5a061bf4e23b170c12c52f0e02f56c2aa6.zip FreeBSD-src-bea2dd5a061bf4e23b170c12c52f0e02f56c2aa6.tar.gz | |
don't try to re-associate after a parameter change, too many ap's
don't do this right; instead go to the scan cache so we pass through
auth state (if the cache is warm we can do this w/o an actual scan)
MFC after: 1 week
Diffstat (limited to 'sys/net80211/ieee80211_proto.c')
| -rw-r--r-- | sys/net80211/ieee80211_proto.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c index 8c9f7c2..8e4df65 100644 --- a/sys/net80211/ieee80211_proto.c +++ b/sys/net80211/ieee80211_proto.c @@ -905,17 +905,7 @@ ieee80211_init(struct ieee80211com *ic, int forcescan) */ if (ic->ic_roaming != IEEE80211_ROAMING_MANUAL) { if (ic->ic_opmode == IEEE80211_M_STA) { - /* - * Try to be intelligent about clocking the state - * machine. If we're currently in RUN state then - * we should be able to apply any new state/parameters - * simply by re-associating. Otherwise we need to - * re-scan to select an appropriate ap. - */ - if (ic->ic_state != IEEE80211_S_RUN || forcescan) - ieee80211_new_state(ic, IEEE80211_S_SCAN, 0); - else - ieee80211_new_state(ic, IEEE80211_S_ASSOC, 1); + ieee80211_new_state(ic, IEEE80211_S_SCAN, 0); } else { /* * For monitor+wds modes there's nothing to do but |
