From owner-p4-projects@FreeBSD.ORG  Mon Jan  3 22:24: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 1EF0C16A4D0; Mon,  3 Jan 2005 22:24: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 E175B16A4CE
	for <perforce@freebsd.org>; Mon,  3 Jan 2005 22:24:27 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D0FCC43D2F
	for <perforce@freebsd.org>; Mon,  3 Jan 2005 22:24:27 +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 j03MORZV057583
	for <perforce@freebsd.org>; Mon, 3 Jan 2005 22:24:27 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j03MORlm057580
	for perforce@freebsd.org; Mon, 3 Jan 2005 22:24:27 GMT
	(envelope-from sam@freebsd.org)
Date: Mon, 3 Jan 2005 22:24:27 GMT
Message-Id: <200501032224.j03MORlm057580@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 68224 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, 03 Jan 2005 22:24:28 -0000

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

Change 68224 by sam@sam_ebb on 2005/01/03 22:23:30

	o count only beacon/probe resp frames we process
	o drop cummulative counter (but leave counter for now)

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_input.c#35 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#35 (text+ko) ====

@@ -1683,15 +1683,6 @@
 		u_int16_t capinfo, bintval, timoff;
 		u_int16_t fhdwell;
 
-		if (subtype == IEEE80211_FC0_SUBTYPE_BEACON) {
-			/*
-			 * Count beacon frames specially, some drivers
-			 * use this info to do things like update LED's.
-			 */
-			ic->ic_stats.is_rx_beacon++;
-			IEEE80211_NODE_STAT(ni, rx_beacons);
-		} else
-			IEEE80211_NODE_STAT(ni, rx_proberesp);
 		/*
 		 * We process beacon/probe response frames:
 		 *    o when scanning, or
@@ -1829,6 +1820,14 @@
 		}
 
 		/*
+		 * Count frame now that we know it's to be processed.
+		 */
+		if (subtype == IEEE80211_FC0_SUBTYPE_BEACON)
+			IEEE80211_NODE_STAT(ni, rx_beacons);
+		else
+			IEEE80211_NODE_STAT(ni, rx_proberesp);
+
+		/*
 		 * When operating in station mode, check for state updates.
 		 * Be careful to ignore beacons received while doing a
 		 * background scan.  We consider only 11g/WMM stuff right now.