From owner-svn-src-user@FreeBSD.ORG  Fri Sep 16 04:09:54 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4D939106564A;
	Fri, 16 Sep 2011 04:09:54 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3DB8C8FC13;
	Fri, 16 Sep 2011 04:09:54 +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 p8G49sZo003267;
	Fri, 16 Sep 2011 04:09:54 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8G49s8O003265;
	Fri, 16 Sep 2011 04:09:54 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201109160409.p8G49s8O003265@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Fri, 16 Sep 2011 04:09:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225602 -
	user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5212
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Sep 2011 04:09:54 -0000

Author: adrian
Date: Fri Sep 16 04:09:53 2011
New Revision: 225602
URL: http://svn.freebsd.org/changeset/base/225602

Log:
  Update the beacon interval value here; hopefully the queue setup
  will occur -after- the beacon interval has been set.
  
  TODO: verify this is actually the case..

Modified:
  user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c

Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c	Fri Sep 16 04:05:58 2011	(r225601)
+++ user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c	Fri Sep 16 04:09:53 2011	(r225602)
@@ -33,6 +33,7 @@
 void
 ar5212SetBeaconTimers(struct ath_hal *ah, const HAL_BEACON_TIMERS *bt)
 {
+	struct ath_hal_5212 *ahp = AH5212(ah);
 
 	OS_REG_WRITE(ah, AR_TIMER0, bt->bt_nexttbtt);
 	OS_REG_WRITE(ah, AR_TIMER1, bt->bt_nextdba);
@@ -54,6 +55,7 @@ ar5212SetBeaconTimers(struct ath_hal *ah
 		OS_REG_WRITE(ah, AR_BEACON, AR_BEACON_RESET_TSF);
 	}
 	OS_REG_WRITE(ah, AR_BEACON, bt->bt_intval);
+	ahp->ah_beaconInterval = (bt->bt_intval & HAL_BEACON_PERIOD);
 }
 
 /*