svn commit: r195550 - projects/mesh11s/sys/net80211

[Rui Paulo]

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 */