From owner-svn-src-projects@FreeBSD.ORG  Fri Jul 10 11:34:43 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 0DF481065673;
	Fri, 10 Jul 2009 11:34:43 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D69AC8FC0C;
	Fri, 10 Jul 2009 11:34:42 +0000 (UTC)
	(envelope-from rpaulo@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 n6ABYgig018907;
	Fri, 10 Jul 2009 11:34:42 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6ABYgI1018904;
	Fri, 10 Jul 2009 11:34:42 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200907101134.n6ABYgI1018904@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Fri, 10 Jul 2009 11:34:42 +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: r195550 - 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 11:34:43 -0000

Author: rpaulo
Date: Fri Jul 10 11:34:42 2009
New Revision: 195550
URL: http://svn.freebsd.org/changeset/base/195550

Log:
  inline ieee80211_mesh_discover().
  
  sponsored by:	The FreeBSD Foundation

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

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Fri Jul 10 11:30:55 2009	(r195549)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Fri Jul 10 11:34:42 2009	(r195550)
@@ -2256,13 +2256,6 @@ ieee80211_add_meshpeer(uint8_t *frm, uin
 	return frm;
 }
 
-struct ieee80211_node *                                                                        
-ieee80211_mesh_discover(struct ieee80211vap *vap,
-    const uint8_t dest[IEEE80211_ADDR_LEN], struct mbuf *m)
-{
-	struct ieee80211_mesh_state *ms = vap->iv_mesh;
-	return ms->ms_ppath->mpp_discover(vap, dest, m);
-}  
 /*
  * Compute an Airtime Link Metric for the link with this node.
  *
@@ -2365,6 +2358,14 @@ ieee80211_mesh_init_neighbor(struct ieee
 	ieee80211_parse_meshid(ni, sp->meshid);
 }
 
+static __inline struct ieee80211_node *
+ieee80211_mesh_discover(struct ieee80211vap *vap,
+    const uint8_t dest[IEEE80211_ADDR_LEN], struct mbuf *m)
+{
+	struct ieee80211_mesh_state *ms = vap->iv_mesh;
+	return ms->ms_ppath->mpp_discover(vap, dest, m);
+}
+
 static int
 mesh_ioctl_get80211(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.h	Fri Jul 10 11:30:55 2009	(r195549)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.h	Fri Jul 10 11:34:42 2009	(r195550)
@@ -493,7 +493,7 @@ struct ieee80211_scanparams;
 void		ieee80211_mesh_init_neighbor(struct ieee80211_node *,
 		   const struct ieee80211_frame *,
 		   const struct ieee80211_scanparams *);
-struct ieee80211_node *
+__inline struct ieee80211_node *
 		ieee80211_mesh_discover(struct ieee80211vap *,
 		    const uint8_t [IEEE80211_ADDR_LEN], struct mbuf *);
 #endif /* _KERNEL */