From owner-p4-projects@FreeBSD.ORG  Mon May 23 21:23:22 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 010AE16A420; Mon, 23 May 2005 21:23:21 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 CE94416A41C
	for <perforce@freebsd.org>; Mon, 23 May 2005 21:23:21 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AB88043D1F
	for <perforce@freebsd.org>; Mon, 23 May 2005 21:23:21 +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 j4NLNLLd093788
	for <perforce@freebsd.org>; Mon, 23 May 2005 21:23:21 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4NLNLmN093785
	for perforce@freebsd.org; Mon, 23 May 2005 21:23:21 GMT
	(envelope-from sam@freebsd.org)
Date: Mon, 23 May 2005 21:23:21 GMT
Message-Id: <200505232123.j4NLNLmN093785@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>
Cc: 
Subject: PERFORCE change 77361 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 23 May 2005 21:23:22 -0000

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

Change 77361 by sam@sam_ebb on 2005/05/23 21:22:28

	track beacon tsf

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_input.c#16 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_input.c#16 (text+ko) ====

@@ -2275,6 +2275,9 @@
 		if (vap->iv_opmode == IEEE80211_M_STA &&
 		    ni->ni_associd != 0 &&
 		    IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_bssid)) {
+			/* record tsf of last beacon */
+			memcpy(ni->ni_tstamp.data, scan.tstamp,
+				sizeof(ni->ni_tstamp));
 			if (ni->ni_erp != scan.erp) {
 				IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC, ni,
 				    "erp change: was 0x%x, now 0x%x",
@@ -2372,17 +2375,19 @@
 				subtype, rssi, rstamp);
 			return;
 		}
-		/*
-		 * Adhoc mode, do neighbor discovery.
-		 * NB: only record ibss stations
-		 */
-		if ((scan.capinfo & IEEE80211_CAPINFO_IBSS) &&
-		    (ni == vap->iv_bss &&
-		     !IEEE80211_ADDR_EQ(ni->ni_macaddr, wh->i_addr2))) {
-			/*
-			 * Create a new entry in the neighbor table.
-			 */
-			ni = ieee80211_add_neighbor(vap, wh, &scan);
+		if (scan.capinfo & IEEE80211_CAPINFO_IBSS) {
+			if (!IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_macaddr)) {
+				/*
+				 * Create a new entry in the neighbor table.
+				 */
+				ni = ieee80211_add_neighbor(vap, wh, &scan);
+			} else {
+				/*
+				 * Record tsf for potential resync.
+				 */
+				memcpy(ni->ni_tstamp.data, scan.tstamp,
+					sizeof(ni->ni_tstamp));
+			}
 			if (ni != NULL) {
 				ni->ni_rssi = rssi;
 				ni->ni_rstamp = rstamp;