From owner-p4-projects@FreeBSD.ORG  Sun Mar 16 02:59:55 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4746A1065670; Sun, 16 Mar 2008 02:59:55 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 055771065676
	for <perforce@freebsd.org>; Sun, 16 Mar 2008 02:59:55 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 04D2B8FC1A
	for <perforce@freebsd.org>; Sun, 16 Mar 2008 02:59:55 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2G2xsBb012593
	for <perforce@freebsd.org>; Sun, 16 Mar 2008 02:59:54 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2G2xsXh012591
	for perforce@freebsd.org; Sun, 16 Mar 2008 02:59:54 GMT
	(envelope-from sam@freebsd.org)
Date: Sun, 16 Mar 2008 02:59:54 GMT
Message-Id: <200803160259.m2G2xsXh012591@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 137820 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: Sun, 16 Mar 2008 02:59:55 -0000

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

Change 137820 by sam@sam_ebb on 2008/03/16 02:59:46

	must check if cb hook is setup

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_amrr.c#8 edit
.. //depot/projects/vap/sys/net80211/ieee80211_proto.c#25 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_amrr.c#8 (text+ko) ====

@@ -172,7 +172,7 @@
 	struct ieee80211_amrr *amrr = amn->amn_amrr;
 	int rix;
 
-	if (is_enough(amn) && ticks - amn->amn_ticks > amrr->amrr_interval) {
+	if (is_enough(amn) && (ticks - amn->amn_ticks) > amrr->amrr_interval) {
 		rix = amrr_update(amrr, amn, ni);
 		if (rix != amn->amn_rix) {
 			/* update public rate */
@@ -180,6 +180,7 @@
 			    ni->ni_rates.rs_rates[rix] & IEEE80211_RATE_VAL;
 			amn->amn_rix = rix;
 		}
+		amn->amn_ticks = ticks;
 	} else
 		rix = amn->amn_rix;
 	return rix;

==== //depot/projects/vap/sys/net80211/ieee80211_proto.c#25 (text+ko) ====

@@ -1681,7 +1681,7 @@
 		vap->iv_newstate_cb = ieee80211_newstate_cb;
 	}
 	rc = vap->iv_newstate(vap, nstate, arg);
-	if (rc == 0)
+	if (rc == 0 && vap->iv_newstate_cb != NULL)
 		vap->iv_newstate_cb(vap, nstate, arg);
 done:
 	return rc;