From owner-p4-projects@FreeBSD.ORG  Tue Sep 16 17:41:03 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DF8B31065684; Tue, 16 Sep 2008 17:41:02 +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 85235106567A
	for <perforce@freebsd.org>; Tue, 16 Sep 2008 17:41:02 +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 76AB58FC19
	for <perforce@freebsd.org>; Tue, 16 Sep 2008 17:41:02 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8GHf2T3048304
	for <perforce@freebsd.org>; Tue, 16 Sep 2008 17:41:02 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8GHf2I1048302
	for perforce@freebsd.org; Tue, 16 Sep 2008 17:41:02 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 16 Sep 2008 17:41:02 GMT
Message-Id: <200809161741.m8GHf2I1048302@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 149886 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: Tue, 16 Sep 2008 17:41:03 -0000

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

Change 149886 by sam@sam_ebb on 2008/09/16 17:40:27

	fix build w/o IEEE80211_DEBUG

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_ht.c#53 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#53 (text+ko) ====

@@ -1205,7 +1205,6 @@
 htinfo_update_chw(struct ieee80211_node *ni, int htflags)
 {
 	struct ieee80211com *ic = ni->ni_ic;
-	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211_channel *c;
 	int chanflags;
 
@@ -1220,7 +1219,7 @@
 			 */
 			c = findhtchan(ic, ni->ni_chan, IEEE80211_CHAN_HT20);
 #if 0
-			IEEE80211_NOTE(vap,
+			IEEE80211_NOTE(ni->ni_vap,
 			    IEEE80211_MSG_ASSOC | IEEE80211_MSG_11N, ni,
 			    "no HT40 channel (freq %u), falling back to HT20",
 			    ni->ni_chan->ic_freq);
@@ -1228,7 +1227,7 @@
 			/* XXX stat */
 		}
 		if (c != NULL && c != ni->ni_chan) {
-			IEEE80211_NOTE(vap,
+			IEEE80211_NOTE(ni->ni_vap,
 			    IEEE80211_MSG_ASSOC | IEEE80211_MSG_11N, ni,
 			    "switch station to HT%d channel %u/0x%x",
 			    IEEE80211_IS_CHAN_HT40(c) ? 40 : 20,