Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 21 Dec 2010 09:14:59 +0000 (UTC)
From:      Bernhard Schmidt <bschmidt@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r216609 - stable/8/sys/dev/wpi
Message-ID:  <201012210914.oBL9ExG4045451@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bschmidt
Date: Tue Dec 21 09:14:59 2010
New Revision: 216609
URL: http://svn.freebsd.org/changeset/base/216609

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.
  
  Approved by:	re (kib)

Modified:
  stable/8/sys/dev/wpi/if_wpi.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/wpi/if_wpi.c
==============================================================================
--- stable/8/sys/dev/wpi/if_wpi.c	Tue Dec 21 09:13:24 2010	(r216608)
+++ stable/8/sys/dev/wpi/if_wpi.c	Tue Dec 21 09:14:59 2010	(r216609)
@@ -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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012210914.oBL9ExG4045451>