From owner-svn-src-head@FreeBSD.ORG  Mon Jul 13 18:23:58 2009
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 B67F8106564A;
	Mon, 13 Jul 2009 18:23:58 +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 A497C8FC0C;
	Mon, 13 Jul 2009 18:23:58 +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 n6DINwcJ032336;
	Mon, 13 Jul 2009 18:23:58 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6DINwxZ032334;
	Mon, 13 Jul 2009 18:23:58 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200907131823.n6DINwxZ032334@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 13 Jul 2009 18:23:58 +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: r195661 - 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: Mon, 13 Jul 2009 18:23:59 -0000

Author: rpaulo
Date: Mon Jul 13 18:23:58 2009
New Revision: 195661
URL: http://svn.freebsd.org/changeset/base/195661

Log:
  Fix inline function declaration and prototype.
  
  Approved by:	re (kensmith)

Modified:
  head/sys/net80211/ieee80211_mesh.c

Modified: head/sys/net80211/ieee80211_mesh.c
==============================================================================
--- head/sys/net80211/ieee80211_mesh.c	Mon Jul 13 18:11:59 2009	(r195660)
+++ head/sys/net80211/ieee80211_mesh.c	Mon Jul 13 18:23:58 2009	(r195661)
@@ -66,9 +66,8 @@ 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 *,
-			    enum ieee80211_mesh_mlstate);
+static 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 *);
 static int	mesh_checkpseq(struct ieee80211vap *,
@@ -2029,7 +2028,7 @@ mesh_peer_timeout_cb(void *arg)
 	}
 }
 
-static __inline int
+static int
 mesh_verify_meshpeerver(struct ieee80211vap *vap, const uint8_t *ie)
 {
 	static const uint8_t peer[4] = IEEE80211_MESHPEERVER_PEER;
@@ -2042,7 +2041,7 @@ mesh_verify_meshpeerver(struct ieee80211
 	return memcmp(meshpeerver->peerver_proto, peer, 4);
 }
 
-static __inline int
+static int
 mesh_verify_meshid(struct ieee80211vap *vap, const uint8_t *ie)
 {
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;