diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2016-01-04 12:25:01 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2016-01-04 12:25:01 +0000 |
| commit | 960396b69a11a924d39f03db35351968847b220a (patch) | |
| tree | e6af4c889752c2a55bcfc33646fa3559d07e0bf8 /sys/net80211/ieee80211_input.c | |
| parent | 10419cfe8595ce76869601c7972a9e2560171e49 (diff) | |
While configuring ERP we need to know if we're in 11a or 11g mode so only
configure ERP once we are sure about our operation mode against the AP.
ok sthen jasper kettenis deraadt mpi
Diffstat (limited to 'sys/net80211/ieee80211_input.c')
| -rw-r--r-- | sys/net80211/ieee80211_input.c | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index 66e59f1302c..8b415333973 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_input.c,v 1.145 2015/12/12 13:56:10 stsp Exp $ */ +/* $OpenBSD: ieee80211_input.c,v 1.146 2016/01/04 12:25:00 stsp Exp $ */ /*- * Copyright (c) 2001 Atsushi Onoe @@ -2250,24 +2250,17 @@ ieee80211_recv_assoc_resp(struct ieee80211com *ic, struct mbuf *m, ieee80211_ht_negotiate(ic, ni); /* Hop into 11n mode after associating to an HT AP in a non-11n mode. */ - if (ic->ic_curmode != IEEE80211_MODE_AUTO && - ic->ic_curmode != IEEE80211_MODE_11N && - (ni->ni_flags & IEEE80211_NODE_HT)) + if (ni->ni_flags & IEEE80211_NODE_HT) ieee80211_setmode(ic, IEEE80211_MODE_11N); - - /* Hop out of 11n mode after associating to a non-HT AP. */ - if (ic->ic_curmode == IEEE80211_MODE_11N && - (ni->ni_flags & IEEE80211_NODE_HT) == 0) { - if (IEEE80211_IS_CHAN_T(ni->ni_chan)) - ieee80211_setmode(ic, IEEE80211_MODE_TURBO); - else if (IEEE80211_IS_CHAN_A(ni->ni_chan)) - ieee80211_setmode(ic, IEEE80211_MODE_11A); - else if (IEEE80211_IS_CHAN_G(ni->ni_chan)) - ieee80211_setmode(ic, IEEE80211_MODE_11G); - else - ieee80211_setmode(ic, IEEE80211_MODE_11B); - } + else #endif + ieee80211_setmode(ic, ieee80211_chan2mode(ic, ni->ni_chan)); + /* + * Reset the erp state (mostly the slot time) now that + * our operating mode has been nailed down. + */ + ieee80211_reset_erp(ic); + /* * Configure state now that we are associated. */ |