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

[Rui Paulo]

Author: rpaulo
Date: Thu Jul  9 18:17:01 2009
New Revision: 195506
URL: http://svn.freebsd.org/changeset/base/195506

Log:
  Use __inline instead of inline.
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Thu Jul  9 18:14:07 2009	(r195505)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Thu Jul  9 18:17:01 2009	(r195506)
@@ -64,7 +64,7 @@ static int	mesh_select_proto_path(struct
 static int	mesh_select_proto_metric(struct ieee80211vap *, const char *);
 static void	mesh_vattach(struct ieee80211vap *);
 static int	mesh_newstate(struct ieee80211vap *, enum ieee80211_state, int);
-static inline void	mesh_linkchange(struct ieee80211_node *,
+static __inline void	mesh_linkchange(struct ieee80211_node *,
 			    enum ieee80211_mesh_mlstate);
 static void	mesh_checkid(void *, struct ieee80211_node *);
 static uint32_t	mesh_generateid(struct ieee80211vap *);
@@ -78,10 +78,10 @@ static void	mesh_forward(struct ieee8021
 static int	mesh_input(struct ieee80211_node *, struct mbuf *, int, int);
 static void	mesh_recv_mgmt(struct ieee80211_node *, struct mbuf *, int,
 		    int, int);
-static inline void	mesh_peer_timeout_setup(struct ieee80211_node *);
+static __inline void	mesh_peer_timeout_setup(struct ieee80211_node *);
 static void		mesh_peer_timeout_backoff(struct ieee80211_node *);
 static void		mesh_peer_timeout_cb(void *);
-static inline void	mesh_peer_timeout_stop(struct ieee80211_node *);
+static __inline void	mesh_peer_timeout_stop(struct ieee80211_node *);
 static int	mesh_verify_meshpeerver(struct ieee80211vap *, const uint8_t *);
 static int	mesh_verify_meshid(struct ieee80211vap *, const uint8_t *);
 static int	mesh_verify_meshconf(struct ieee80211vap *, const uint8_t *);
@@ -566,7 +566,7 @@ mesh_newstate(struct ieee80211vap *vap, 
  * of the less interesting frames that come frequently
  * (e.g. beacons).
  */
-static inline int
+static __inline int
 doprint(struct ieee80211vap *vap, int subtype)
 {
 	switch (subtype) {
@@ -581,7 +581,7 @@ doprint(struct ieee80211vap *vap, int su
 /*
  * Helper function to note the Mesh Peer Link FSM change.
  */
-static inline void
+static __inline void
 mesh_linkchange(struct ieee80211_node *ni, enum ieee80211_mesh_mlstate state)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
@@ -1957,7 +1957,7 @@ mesh_send_action_meshlink_reply(struct i
 	}
 }
 
-static inline void
+static __inline void
 mesh_peer_timeout_setup(struct ieee80211_node *ni)
 {
 	switch (ni->ni_mlstate) {
@@ -1992,7 +1992,7 @@ mesh_peer_timeout_backoff(struct ieee802
 	    ni);
 }
 
-static inline void
+static __inline void
 mesh_peer_timeout_stop(struct ieee80211_node *ni)
 {
 	callout_stop(&ni->ni_mltimer);
@@ -2058,7 +2058,7 @@ mesh_peer_timeout_cb(void *arg)
 	}
 }
 
-static inline int
+static __inline int
 mesh_verify_meshpeerver(struct ieee80211vap *vap, const uint8_t *ie)
 {
 	static const uint8_t peer[4] = IEEE80211_MESHPEERVER_PEER;
@@ -2069,7 +2069,7 @@ mesh_verify_meshpeerver(struct ieee80211
 	return memcmp(meshpeerver->peerver_proto, peer, 4);
 }
 
-static inline int
+static __inline int
 mesh_verify_meshid(struct ieee80211vap *vap, const uint8_t *ie)
 {
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;