svn commit: r216522 - head/sys/dev/wpi

[Bernhard Schmidt]

Author: bschmidt
Date: Sat Dec 18 15:35:10 2010
New Revision: 216522
URL: http://svn.freebsd.org/changeset/base/216522

Log:
  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

Modified:
  head/sys/dev/wpi/if_wpi.c

Modified: head/sys/dev/wpi/if_wpi.c
==============================================================================
--- head/sys/dev/wpi/if_wpi.c	Sat Dec 18 15:25:21 2010	(r216521)
+++ head/sys/dev/wpi/if_wpi.c	Sat Dec 18 15:35:10 2010	(r216522)
@@ -2429,6 +2429,9 @@ wpi_auth(struct wpi_softc *sc, struct ie
 	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;