From owner-p4-projects@FreeBSD.ORG  Mon May  9 15:36:28 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 71B1716A4EC; Mon,  9 May 2005 15:36:28 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 41EA416A4E9
	for <perforce@freebsd.org>; Mon,  9 May 2005 15:36:28 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2E91243D77
	for <perforce@freebsd.org>; Mon,  9 May 2005 15:36:28 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j49FaSWf075966
	for <perforce@freebsd.org>; Mon, 9 May 2005 15:36:28 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j49FaR5x075963
	for perforce@freebsd.org; Mon, 9 May 2005 15:36:27 GMT
	(envelope-from sam@freebsd.org)
Date: Mon, 9 May 2005 15:36:27 GMT
Message-Id: <200505091536.j49FaR5x075963@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 76751 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 May 2005 15:36:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=76751

Change 76751 by sam@sam_ebb on 2005/05/09 15:36:15

	fix mismerge; ap mode works

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#10 edit
.. //depot/projects/vap/sys/dev/ath/if_athvar.h#6 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/if_ath.c#10 (text+ko) ====

@@ -2766,8 +2766,6 @@
 	 * Enable the CAB queue before the beacon queue to
 	 * insure cab frames are triggered by this beacon.
 	 */
-	if (sc->sc_boff.bo_tim[4] & 1)		/* NB: only at DTIM */
-		ath_hal_txstart(ah, cabq->axq_qnum);
 	if (avp->av_boff.bo_tim[4] & 1)	{	/* NB: only at DTIM */
 		struct ath_buf *bfmcast;
 		/*

==== //depot/projects/vap/sys/dev/ath/if_athvar.h#6 (text+ko) ====

@@ -330,7 +330,6 @@
 	u_int			sc_bmisscount;	/* missed beacon transmits */
 	u_int32_t		sc_ant_tx[8];	/* recent tx frames/antenna */
 	struct ath_txq		*sc_cabq;	/* tx q for cab frames */
-	struct ieee80211_beacon_offsets sc_boff;/* dynamic update state */
 	struct task		sc_bmisstask;	/* bmiss int processing */
 	struct task		sc_bstucktask;	/* stuck beacon processing */
 	enum {