svn commit: r196940 - in stable/8/sys: . amd64/include/xen cddl/contrib/opensolaris contrib/dev/acpica contrib/pf dev/ath dev/xen/xenpci

Sam Leffler sam at FreeBSD.org
Mon Sep 7 16:41:19 UTC 2009


Author: sam
Date: Mon Sep  7 16:41:18 2009
New Revision: 196940
URL: http://svn.freebsd.org/changeset/base/196940

Log:
  MFC r196717:
      fix beacon timers on resume in sta mode so raoming works
  
  Approved by:	re (kensmith)

Modified:
  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)
  stable/8/sys/dev/ath/if_ath.c
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/ath/if_ath.c
==============================================================================
--- stable/8/sys/dev/ath/if_ath.c	Mon Sep  7 16:33:27 2009	(r196939)
+++ stable/8/sys/dev/ath/if_ath.c	Mon Sep  7 16:41:18 2009	(r196940)
@@ -1236,7 +1236,16 @@ ath_resume(struct ath_softc *sc)
 	if (sc->sc_resume_up) {
 		if (ic->ic_opmode == IEEE80211_M_STA) {
 			ath_init(sc);
-			ieee80211_beacon_miss(ic);
+			/*
+			 * Program the beacon registers using the last rx'd
+			 * beacon frame and enable sync on the next beacon
+			 * we see.  This should handle the case where we
+			 * wakeup and find the same AP and also the case where
+			 * we wakeup and need to roam.  For the latter we
+			 * should get bmiss events that trigger a roam.
+			 */
+			ath_beacon_config(sc, NULL);
+			sc->sc_syncbeacon = 1;
 		} else
 			ieee80211_resume_all(ic);
 	}


More information about the svn-src-stable-8 mailing list