From owner-svn-src-head@FreeBSD.ORG  Sun Oct 26 21:59:07 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8A4401065676;
	Sun, 26 Oct 2008 21:59:07 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 78C9A8FC12;
	Sun, 26 Oct 2008 21:59:07 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QLx7a8097163;
	Sun, 26 Oct 2008 21:59:07 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9QLx7J3097162;
	Sun, 26 Oct 2008 21:59:07 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200810262159.m9QLx7J3097162@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Sun, 26 Oct 2008 21:59:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184303 - head/sys/net80211
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Oct 2008 21:59:07 -0000

Author: sam
Date: Sun Oct 26 21:59:07 2008
New Revision: 184303
URL: http://svn.freebsd.org/changeset/base/184303

Log:
  o re-enable a lock assert
  o while here reformat a comment to sync w/ other repot's

Modified:
  head/sys/net80211/ieee80211_node.c

Modified: head/sys/net80211/ieee80211_node.c
==============================================================================
--- head/sys/net80211/ieee80211_node.c	Sun Oct 26 21:56:27 2008	(r184302)
+++ head/sys/net80211/ieee80211_node.c	Sun Oct 26 21:59:07 2008	(r184303)
@@ -598,8 +598,8 @@ gethtadjustflags(struct ieee80211com *ic
 
 /*
  * Check if the current channel needs to change based on whether
- * any vap's are using HT20/HT40.  This is used sync the state of
- * ic_curchan after a channel width change on a running vap.
+ * any vap's are using HT20/HT40.  This is used to sync the state
+ * of ic_curchan after a channel width change on a running vap.
  */
 void
 ieee80211_sync_curchan(struct ieee80211com *ic)
@@ -952,9 +952,9 @@ static void
 node_age(struct ieee80211_node *ni)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
-#if 0
-	IEEE80211_NODE_LOCK_ASSERT(&ic->ic_sta);
-#endif
+
+	IEEE80211_NODE_LOCK_ASSERT(&vap->iv_ic->ic_sta);
+
 	/*
 	 * Age frames on the power save queue.
 	 */