From owner-p4-projects@FreeBSD.ORG  Wed Sep 28 00:47:17 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 080BB16A422; Wed, 28 Sep 2005 00:47:17 +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 D544316A41F
	for <perforce@freebsd.org>; Wed, 28 Sep 2005 00:47:16 +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 9CE4F43D49
	for <perforce@freebsd.org>; Wed, 28 Sep 2005 00:47:16 +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 j8S0lGm3064103
	for <perforce@freebsd.org>; Wed, 28 Sep 2005 00:47:16 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8S0lGA7064099
	for perforce@freebsd.org; Wed, 28 Sep 2005 00:47:16 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 28 Sep 2005 00:47:16 GMT
Message-Id: <200509280047.j8S0lGA7064099@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 84405 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: Wed, 28 Sep 2005 00:47:17 -0000

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

Change 84405 by sam@sam_ebb on 2005/09/28 00:47:02

	last try was wrong; this should work

Affected files ...

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

Differences ...

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

@@ -3351,13 +3351,6 @@
 		 */
 		type = ieee80211_input(ic, m, ni,
 			ds->ds_rxstat.rs_rssi, ds->ds_rxstat.rs_tstamp);
-		/*
-		 * Arrange to update the last rx timestamp only for
-		 * frames from our ap.  This is a crude check but
-		 * should be good enough for our purpose.
-		 */
-		if (ni == ic->ic_bss)
-			ngood++;
 		ieee80211_free_node(ni);
 		if (sc->sc_diversity) {
 			/*
@@ -3385,6 +3378,14 @@
 			} else if (ticks - sc->sc_ledevent >= sc->sc_ledidle)
 				ath_led_event(sc, ATH_LED_POLL);
 		}
+		/*
+		 * Arrange to update the last rx timestamp only for
+		 * frames from our ap when operating in station mode.
+		 * This assumes the rx key is always set when associated.
+		 */
+		if (ic->ic_opmode == IEEE80211_M_STA &&
+		    ds->ds_rxstat.rs_keyix != HAL_RXKEYIX_INVALID)
+			ngood++;
 rx_next:
 		STAILQ_INSERT_TAIL(&sc->sc_rxbuf, bf, bf_list);
 	} while (ath_rxbuf_init(sc, bf) == 0);