From owner-svn-src-head@FreeBSD.ORG  Fri Jun 15 01:16:00 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3EE021065679;
	Fri, 15 Jun 2012 01:16:00 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 2A92B8FC12;
	Fri, 15 Jun 2012 01:16:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5F1G0mA032596;
	Fri, 15 Jun 2012 01:16:00 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5F1FxBr032594;
	Fri, 15 Jun 2012 01:15:59 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201206150115.q5F1FxBr032594@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Fri, 15 Jun 2012 01:15:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237108 - head/sys/dev/ath
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Jun 2012 01:16:00 -0000

Author: adrian
Date: Fri Jun 15 01:15:59 2012
New Revision: 237108
URL: http://svn.freebsd.org/changeset/base/237108

Log:
  Convert ath(4) to just use ieee80211_suspend_all() and ieee80211_resume_all().
  
  The existing code tries to use the beacon miss timer to signal that the AP
  has gone away.  Unfortunately this doesn't seem to be behaving itself.
  I'll try to investigate why this is for the sake of completeness.
  
  The result is the STA will stay "associated" to the AP it was associated
  with when it suspended.  It never receives a bmiss notification so it
  never tries reassociating.
  
  PR:		kern/169084

Modified:
  head/sys/dev/ath/if_ath.c

Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c	Thu Jun 14 22:19:23 2012	(r237107)
+++ head/sys/dev/ath/if_ath.c	Fri Jun 15 01:15:59 2012	(r237108)
@@ -1310,8 +1310,13 @@ ath_suspend(struct ath_softc *sc)
 
 	sc->sc_resume_up = (ifp->if_flags & IFF_UP) != 0;
 	if (ic->ic_opmode == IEEE80211_M_STA)
+	/*
+	 * This has been disabled - see PR kern/169084.
+	 */
+#if 0
 		ath_stop(ifp);
 	else
+#endif
 		ieee80211_suspend_all(ic);
 	/*
 	 * NB: don't worry about putting the chip in low power
@@ -1379,6 +1384,15 @@ ath_resume(struct ath_softc *sc)
 	ath_hal_setledstate(ah, HAL_LED_INIT);
 
 	if (sc->sc_resume_up) {
+		/*
+		 * This particular feature doesn't work at the present,
+		 * at least on the 802.11n chips.  It's quite possible
+		 * that the STA Beacon timers aren't being configured
+		 * properly.
+		 *
+		 * See PR kern/169084.
+		 */
+#if 0
 		if (ic->ic_opmode == IEEE80211_M_STA) {
 			ath_init(sc);
 			ath_hal_setledstate(ah, HAL_LED_RUN);
@@ -1392,7 +1406,9 @@ ath_resume(struct ath_softc *sc)
 			 */
 			ath_beacon_config(sc, NULL);
 			sc->sc_syncbeacon = 1;
+			ieee80211_resume_all(ic);
 		} else
+#endif
 			ieee80211_resume_all(ic);
 	}