From owner-svn-src-projects@FreeBSD.ORG  Fri Jul 10 18:34:19 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 97FB91065712;
	Fri, 10 Jul 2009 18:34:19 +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 86AE88FC12;
	Fri, 10 Jul 2009 18:34:19 +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 n6AIYJ1a028487;
	Fri, 10 Jul 2009 18:34:19 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6AIYJ6p028485;
	Fri, 10 Jul 2009 18:34:19 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200907101834.n6AIYJ6p028485@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Fri, 10 Jul 2009 18:34:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195576 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jul 2009 18:34:20 -0000

Author: sam
Date: Fri Jul 10 18:34:19 2009
New Revision: 195576
URL: http://svn.freebsd.org/changeset/base/195576

Log:
  fix building w/o IEEE80211_DEBUG

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Fri Jul 10 18:24:02 2009	(r195575)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Fri Jul 10 18:34:19 2009	(r195576)
@@ -1576,11 +1576,10 @@ mesh_recv_action_meshpeering_close(struc
 	const struct ieee80211_frame *wh,
 	const uint8_t *frm, const uint8_t *efrm)
 {
-	struct ieee80211vap *vap = ni->ni_vap;
 	uint16_t args[3];
 
-	IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni,
-	    "%s", "recv PEER CLOSE");
+	IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH,
+	    ni, "%s", "recv PEER CLOSE");
 
 	switch (ni->ni_mlstate) {
 	case IEEE80211_NODE_MESH_IDLE:
@@ -1979,11 +1978,9 @@ static void
 mesh_peer_timeout_cb(void *arg)
 {
 	struct ieee80211_node *ni = (struct ieee80211_node *)arg;
-	struct ieee80211vap *vap = ni->ni_vap;
 	uint16_t args[3];
 
-	IEEE80211_NOTE(vap,
-	    IEEE80211_MSG_MESH,
+	IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_MESH,
 	    ni, "mesh link timeout, state %d, retry counter %d",
 	    ni->ni_mlstate, ni->ni_mlrcnt);