summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbschmidt <bschmidt@FreeBSD.org>2010-12-18 15:35:10 +0000
committerbschmidt <bschmidt@FreeBSD.org>2010-12-18 15:35:10 +0000
commitf252b73cec3c319453bf4d2cfb0c2f6fd76a3dbf (patch)
tree60c14281ba71ea489e56773a5f5d6aaf8b14fa6c
parente9d9d7a03ac556ff59c91e683c2dc034df144a45 (diff)
downloadFreeBSD-src-f252b73cec3c319453bf4d2cfb0c2f6fd76a3dbf.zip
FreeBSD-src-f252b73cec3c319453bf4d2cfb0c2f6fd76a3dbf.tar.gz
Fix association on 5GHz channels. The device is initially configured using
a 2GHz channel with appropriate flags set to sc->config. Due to not zeroing sc->config for auth/assoc those flags are still set while trying to connect on a 5GHz channel. MFC after: 3 days
-rw-r--r--sys/dev/wpi/if_wpi.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/dev/wpi/if_wpi.c b/sys/dev/wpi/if_wpi.c
index c5b171f..a2fb151 100644
--- a/sys/dev/wpi/if_wpi.c
+++ b/sys/dev/wpi/if_wpi.c
@@ -2429,6 +2429,9 @@ wpi_auth(struct wpi_softc *sc, struct ieee80211vap *vap)
if (IEEE80211_IS_CHAN_2GHZ(ni->ni_chan)) {
sc->config.flags |= htole32(WPI_CONFIG_AUTO |
WPI_CONFIG_24GHZ);
+ } else {
+ sc->config.flags &= ~htole32(WPI_CONFIG_AUTO |
+ WPI_CONFIG_24GHZ);
}
if (IEEE80211_IS_CHAN_A(ni->ni_chan)) {
sc->config.cck_mask = 0;
OpenPOWER on IntegriCloud