PERFORCE change 68224 for review

[Sam Leffler]

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

Change 68224 by sam at 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.