From owner-p4-projects@FreeBSD.ORG  Thu Feb 21 00:25:36 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2A83916A407; Thu, 21 Feb 2008 00:25:36 +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 CBC5916A404
	for <perforce@freebsd.org>; Thu, 21 Feb 2008 00:25:35 +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 BBB6E13C442
	for <perforce@freebsd.org>; Thu, 21 Feb 2008 00:25:35 +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 m1L0PZWi019313
	for <perforce@freebsd.org>; Thu, 21 Feb 2008 00:25:35 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1L0PZch019310
	for perforce@freebsd.org; Thu, 21 Feb 2008 00:25:35 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 21 Feb 2008 00:25:35 GMT
Message-Id: <200802210025.m1L0PZch019310@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 135858 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: Thu, 21 Feb 2008 00:25:36 -0000

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

Change 135858 by sam@sam_ebb on 2008/02/21 00:25:26

	guard against being called prior to associate; probably should
	overhaul the api's but this stuff is too lame to waste time on

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_rssadapt.c#3 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_rssadapt.c#3 (text+ko) ====

@@ -215,13 +215,15 @@
 }
 
 void
-ieee80211_rssadapt_tx_complete(struct ieee80211_rssadapt_node *rn,
+ieee80211_rssadapt_tx_complete(struct ieee80211_rssadapt_node *ra,
     int success, int pktlen, int rate, int rssi)
 {
-	if (success)
-		rssadapt_raise_rate(rn, pktlen, rate, rssi);
-	else
-		rssadapt_lower_rate(rn, pktlen, rate, rssi);
+	if (ra->ra_ni != NULL) {	/* setup when associated */
+		if (success)
+			rssadapt_raise_rate(ra, pktlen, rate, rssi);
+		else
+			rssadapt_lower_rate(ra, pktlen, rate, rssi);
+	}
 }
 
 /*