From owner-p4-projects@FreeBSD.ORG  Sat Jan  8 00:18:02 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E80DB16A4D0; Sat,  8 Jan 2005 00:18:01 +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 AEE1816A4CE
	for <perforce@freebsd.org>; Sat,  8 Jan 2005 00:18:01 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9F51143D46
	for <perforce@freebsd.org>; Sat,  8 Jan 2005 00:18:01 +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 j080I1rn078084
	for <perforce@freebsd.org>; Sat, 8 Jan 2005 00:18:01 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j080I1WN078081
	for perforce@freebsd.org; Sat, 8 Jan 2005 00:18:01 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 8 Jan 2005 00:18:01 GMT
Message-Id: <200501080018.j080I1WN078081@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 68511 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: Sat, 08 Jan 2005 00:18:02 -0000

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

Change 68511 by sam@sam_ebb on 2005/01/08 00:17:59

	save untested fix for adhoc mode

Affected files ...

.. //depot/projects/wifi/sys/dev/ath/if_ath.c#62 edit

Differences ...

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

@@ -2798,8 +2798,18 @@
 			 * is determined by the tsf.
 			 */
 			if (le64toh(ni->ni_tstamp.tsf) >= tsf &&
-			    ieee80211_ibss_merge(ic, ni))
+			    ieee80211_ibss_merge(ic, ni)) {
+				/*
+				 * XXX rather than handle this here it's
+				 *     probably better to do it at the 802.11
+				 *     layer through the state machine so,
+				 *     we can switch channel, etc.
+				 */
+				/* XXX adopt beacon interval and ATIM window */
 				ath_hal_setassocid(ah, ic->ic_bss->ni_bssid, 0);
+				ath_hal_stoptxdma(ah, sc->sc_bhalq);
+				ath_beacon_config(sc);
+			}
 		}
 		break;
 	}