remove extern from function decls

4 files changed, 83 insertions, 93 deletions

diff --git a/sys/net80211/ieee80211_crypto.h b/sys/net80211/ieee80211_crypto.h
index a14bf3c..7f18c2d 100644
--- a/sys/net80211/ieee80211_crypto.h
+++ b/sys/net80211/ieee80211_crypto.h
@@ -130,15 +130,15 @@ struct ieee80211_crypto_state {
 	void			(*cs_key_update_end)(struct ieee80211com *);
 };
 
-extern	void ieee80211_crypto_attach(struct ieee80211com *);
-extern	void ieee80211_crypto_detach(struct ieee80211com *);
-extern	int ieee80211_crypto_newkey(struct ieee80211com *,
+void	ieee80211_crypto_attach(struct ieee80211com *);
+void	ieee80211_crypto_detach(struct ieee80211com *);
+int	ieee80211_crypto_newkey(struct ieee80211com *,
 		int cipher, struct ieee80211_key *);
-extern	int ieee80211_crypto_delkey(struct ieee80211com *,
+int	ieee80211_crypto_delkey(struct ieee80211com *,
 		struct ieee80211_key *);
-extern	int ieee80211_crypto_setkey(struct ieee80211com *,
+int	ieee80211_crypto_setkey(struct ieee80211com *,
 		struct ieee80211_key *, const u_int8_t macaddr[IEEE80211_ADDR_LEN]);
-extern	void ieee80211_crypto_delglobalkeys(struct ieee80211com *);
+void	ieee80211_crypto_delglobalkeys(struct ieee80211com *);
 
 /*
  * Template for a supported cipher.  Ciphers register with the
@@ -163,13 +163,13 @@ struct ieee80211_cipher {
 };
 extern	const struct ieee80211_cipher ieee80211_cipher_none;
 
-extern	void ieee80211_crypto_register(const struct ieee80211_cipher *);
-extern	void ieee80211_crypto_unregister(const struct ieee80211_cipher *);
-extern	int ieee80211_crypto_available(u_int cipher);
+void	ieee80211_crypto_register(const struct ieee80211_cipher *);
+void	ieee80211_crypto_unregister(const struct ieee80211_cipher *);
+int	ieee80211_crypto_available(u_int cipher);
 
-extern	struct ieee80211_key *ieee80211_crypto_encap(struct ieee80211com *,
+struct ieee80211_key *ieee80211_crypto_encap(struct ieee80211com *,
 		struct ieee80211_node *, struct mbuf *);
-extern	struct ieee80211_key *ieee80211_crypto_decap(struct ieee80211com *,
+struct ieee80211_key *ieee80211_crypto_decap(struct ieee80211com *,
 		struct ieee80211_node *, struct mbuf *);
 
 /*
@@ -212,10 +212,10 @@ ieee80211_crypto_resetkey(struct ieee80211com *ic,
 /*
  * Crypt-related notification methods.
  */
-extern	void ieee80211_notify_replay_failure(struct ieee80211com *,
+void	ieee80211_notify_replay_failure(struct ieee80211com *,
 		const struct ieee80211_frame *, const struct ieee80211_key *,
 		u_int64_t rsc);
-extern	void ieee80211_notify_michael_failure(struct ieee80211com *,
+void	ieee80211_notify_michael_failure(struct ieee80211com *,
 		const struct ieee80211_frame *, u_int keyix);
 #endif /* defined(__KERNEL__) || defined(_KERNEL) */
 #endif /* _NET80211_IEEE80211_CRYPTO_H_ */
diff --git a/sys/net80211/ieee80211_freebsd.h b/sys/net80211/ieee80211_freebsd.h
index 33c26a5..94b5296 100644
--- a/sys/net80211/ieee80211_freebsd.h
+++ b/sys/net80211/ieee80211_freebsd.h
@@ -142,10 +142,10 @@ typedef struct mtx acl_lock_t;
 #define	ieee80211_node_decref(_ni) \
 	atomic_subtract_int(&(_ni)->ni_refcnt, 1)
 struct ieee80211_node;
-extern	int ieee80211_node_dectestref(struct ieee80211_node *ni);
+int	ieee80211_node_dectestref(struct ieee80211_node *ni);
 #define	ieee80211_node_refcnt(_ni)	(_ni)->ni_refcnt
 
-extern	struct mbuf *ieee80211_getmgtframe(u_int8_t **frm, u_int pktlen);
+struct mbuf *ieee80211_getmgtframe(u_int8_t **frm, u_int pktlen);
 #define	M_LINK0		M_PROTO1		/* WEP requested */
 #define	M_PWR_SAV	M_PROTO4		/* bypass PS handling */
 /*
@@ -172,7 +172,7 @@ extern	struct mbuf *ieee80211_getmgtframe(u_int8_t **frm, u_int pktlen);
 #define	M_AGE_GET(m)		(m->m_pkthdr.csum_data)
 #define	M_AGE_SUB(m,adj)	(m->m_pkthdr.csum_data -= adj)
 
-extern	void get_random_bytes(void *, size_t);
+void	get_random_bytes(void *, size_t);
 
 struct ieee80211com;
 
diff --git a/sys/net80211/ieee80211_node.h b/sys/net80211/ieee80211_node.h
index 20556e0..5e3b8c2 100644
--- a/sys/net80211/ieee80211_node.h
+++ b/sys/net80211/ieee80211_node.h
@@ -169,9 +169,9 @@ ieee80211_unref_node(struct ieee80211_node **ni)
 
 struct ieee80211com;
 
-extern	void ieee80211_node_attach(struct ieee80211com *);
-extern	void ieee80211_node_lateattach(struct ieee80211com *);
-extern	void ieee80211_node_detach(struct ieee80211com *);
+void	ieee80211_node_attach(struct ieee80211com *);
+void	ieee80211_node_lateattach(struct ieee80211com *);
+void	ieee80211_node_detach(struct ieee80211com *);
 
 static __inline int
 ieee80211_node_is_authorized(const struct ieee80211_node *ni)
@@ -179,24 +179,20 @@ ieee80211_node_is_authorized(const struct ieee80211_node *ni)
 	return (ni->ni_flags & IEEE80211_NODE_AUTH);
 }
 
-extern	void ieee80211_node_authorize(struct ieee80211com *,
+void	ieee80211_node_authorize(struct ieee80211com *,
 		struct ieee80211_node *);
-extern	void ieee80211_node_unauthorize(struct ieee80211com *,
+void	ieee80211_node_unauthorize(struct ieee80211com *,
 		struct ieee80211_node *);
 
-extern	void ieee80211_begin_scan(struct ieee80211com *, int);
-extern	int ieee80211_next_scan(struct ieee80211com *);
-extern	void ieee80211_create_ibss(struct ieee80211com*,
-		struct ieee80211_channel *);
-extern	void ieee80211_reset_bss(struct ieee80211com *);
-extern	void ieee80211_cancel_scan(struct ieee80211com *);
-extern	void ieee80211_end_scan(struct ieee80211com *);
-extern	int ieee80211_ibss_merge(struct ieee80211com *,
-		struct ieee80211_node *);
-extern	int ieee80211_sta_join(struct ieee80211com *,
-		struct ieee80211_node *);
-extern	void ieee80211_sta_leave(struct ieee80211com *,
-		struct ieee80211_node *);
+void	ieee80211_begin_scan(struct ieee80211com *, int);
+int	ieee80211_next_scan(struct ieee80211com *);
+void	ieee80211_create_ibss(struct ieee80211com*, struct ieee80211_channel *);
+void	ieee80211_reset_bss(struct ieee80211com *);
+void	ieee80211_cancel_scan(struct ieee80211com *);
+void	ieee80211_end_scan(struct ieee80211com *);
+int	ieee80211_ibss_merge(struct ieee80211com *, struct ieee80211_node *);
+int	ieee80211_sta_join(struct ieee80211com *, struct ieee80211_node *);
+void	ieee80211_sta_leave(struct ieee80211com *, struct ieee80211_node *);
 
 /*
  * Table of ieee80211_node instances.  Each ieee80211com
@@ -217,28 +213,28 @@ struct ieee80211_node_table {
 
 	void			(*nt_timeout)(struct ieee80211_node_table *);
 };
-extern	void ieee80211_node_table_reset(struct ieee80211_node_table *);
+void	ieee80211_node_table_reset(struct ieee80211_node_table *);
 
-extern	struct ieee80211_node *ieee80211_alloc_node(
+struct ieee80211_node *ieee80211_alloc_node(
 		struct ieee80211_node_table *, const u_int8_t *);
-extern	struct ieee80211_node *ieee80211_dup_bss(struct ieee80211_node_table *,
+struct ieee80211_node *ieee80211_dup_bss(struct ieee80211_node_table *,
 		const u_int8_t *);
 #ifdef IEEE80211_DEBUG_REFCNT
-extern	void ieee80211_free_node_debug(struct ieee80211_node *,
+void	ieee80211_free_node_debug(struct ieee80211_node *,
 		const char *func, int line);
-extern	struct ieee80211_node *ieee80211_find_node_debug(
+struct ieee80211_node *ieee80211_find_node_debug(
 		struct ieee80211_node_table *, const u_int8_t *,
 		const char *func, int line);
-extern	struct ieee80211_node * ieee80211_find_rxnode_debug(
+struct ieee80211_node * ieee80211_find_rxnode_debug(
 		struct ieee80211com *, const struct ieee80211_frame_min *,
 		const char *func, int line);
-extern	struct ieee80211_node *ieee80211_find_txnode_debug(
+struct ieee80211_node *ieee80211_find_txnode_debug(
 		struct ieee80211com *, const u_int8_t *,
 		const char *func, int line);
-extern	struct ieee80211_node *ieee80211_find_node_with_channel_debug(
+struct ieee80211_node *ieee80211_find_node_with_channel_debug(
 		struct ieee80211_node_table *, const u_int8_t *macaddr,
 		struct ieee80211_channel *, const char *func, int line);
-extern	struct ieee80211_node *ieee80211_find_node_with_ssid_debug(
+struct ieee80211_node *ieee80211_find_node_with_ssid_debug(
 		struct ieee80211_node_table *, const u_int8_t *macaddr,
 		u_int ssidlen, const u_int8_t *ssid,
 		const char *func, int line);
@@ -255,35 +251,32 @@ extern	struct ieee80211_node *ieee80211_find_node_with_ssid_debug(
 #define	ieee80211_find_node_with_ssid(nt, mac, sl, ss) \
 	ieee80211_find_node_with_ssid_debug(nt, mac, sl, ss, __func__, __LINE__)
 #else
-extern	void ieee80211_free_node(struct ieee80211_node *);
-extern	struct ieee80211_node *ieee80211_find_node(
+void	ieee80211_free_node(struct ieee80211_node *);
+struct ieee80211_node *ieee80211_find_node(
 		struct ieee80211_node_table *, const u_int8_t *);
-extern	struct ieee80211_node * ieee80211_find_rxnode(
+struct ieee80211_node * ieee80211_find_rxnode(
 		struct ieee80211com *, const struct ieee80211_frame_min *);
-extern	struct ieee80211_node *ieee80211_find_txnode(
+struct ieee80211_node *ieee80211_find_txnode(
 		struct ieee80211com *, const u_int8_t *);
-extern	struct ieee80211_node *ieee80211_find_node_with_channel(
+struct ieee80211_node *ieee80211_find_node_with_channel(
 		struct ieee80211_node_table *, const u_int8_t *macaddr,
 		struct ieee80211_channel *);
-extern	struct ieee80211_node *ieee80211_find_node_with_ssid(
+struct ieee80211_node *ieee80211_find_node_with_ssid(
 		struct ieee80211_node_table *, const u_int8_t *macaddr,
 		u_int ssidlen, const u_int8_t *ssid);
 #endif
 
 typedef void ieee80211_iter_func(void *, struct ieee80211_node *);
-extern	void ieee80211_iterate_nodes(struct ieee80211_node_table *,
+void	ieee80211_iterate_nodes(struct ieee80211_node_table *,
 		ieee80211_iter_func *, void *);
 
-extern	void ieee80211_dump_node(struct ieee80211_node_table *,
+void	ieee80211_dump_node(struct ieee80211_node_table *,
 		struct ieee80211_node *);
-extern	void ieee80211_dump_nodes(struct ieee80211_node_table *);
+void	ieee80211_dump_nodes(struct ieee80211_node_table *);
 
-extern	struct ieee80211_node *ieee80211_fakeup_adhoc_node(
-		struct ieee80211_node_table *nt,
-		const u_int8_t macaddr[]);
-extern	void ieee80211_node_join(struct ieee80211com *,
-		struct ieee80211_node *, int);
-extern	void ieee80211_node_leave(struct ieee80211com *,
-		struct ieee80211_node *);
-extern	u_int8_t ieee80211_getrssi(struct ieee80211com *ic);
+struct ieee80211_node *ieee80211_fakeup_adhoc_node(
+		struct ieee80211_node_table *, const u_int8_t macaddr[]);
+void	ieee80211_node_join(struct ieee80211com *, struct ieee80211_node *,int);
+void	ieee80211_node_leave(struct ieee80211com *, struct ieee80211_node *);
+u_int8_t ieee80211_getrssi(struct ieee80211com *ic);
 #endif /* _NET80211_IEEE80211_NODE_H_ */
diff --git a/sys/net80211/ieee80211_proto.h b/sys/net80211/ieee80211_proto.h
index 4bda356..bd6a222 100644
--- a/sys/net80211/ieee80211_proto.h
+++ b/sys/net80211/ieee80211_proto.h
@@ -53,30 +53,29 @@ enum ieee80211_state {
 extern	const char *ieee80211_mgt_subtype_name[];
 extern	const char *ieee80211_phymode_name[];
 
-extern	void ieee80211_proto_attach(struct ieee80211com *);
-extern	void ieee80211_proto_detach(struct ieee80211com *);
+void	ieee80211_proto_attach(struct ieee80211com *);
+void	ieee80211_proto_detach(struct ieee80211com *);
 
 struct ieee80211_node;
-extern	int ieee80211_input(struct ieee80211com *, struct mbuf *,
+int	ieee80211_input(struct ieee80211com *, struct mbuf *,
 		struct ieee80211_node *, int, u_int32_t);
-extern	void ieee80211_recv_mgmt(struct ieee80211com *, struct mbuf *,
+void	ieee80211_recv_mgmt(struct ieee80211com *, struct mbuf *,
 		struct ieee80211_node *, int, int, u_int32_t);
-extern	int ieee80211_send_nulldata(struct ieee80211com *,
-		struct ieee80211_node *);
-extern	int ieee80211_send_mgmt(struct ieee80211com *, struct ieee80211_node *,
+int	ieee80211_send_nulldata(struct ieee80211com *, struct ieee80211_node *);
+int	ieee80211_send_mgmt(struct ieee80211com *, struct ieee80211_node *,
 		int, int);
-extern	int ieee80211_classify(struct ieee80211com *, struct mbuf *,
+int	ieee80211_classify(struct ieee80211com *, struct mbuf *,
 		struct ieee80211_node *);
-extern	struct mbuf *ieee80211_encap(struct ieee80211com *, struct mbuf *,
+struct mbuf *ieee80211_encap(struct ieee80211com *, struct mbuf *,
 		struct ieee80211_node *);
-extern	void ieee80211_pwrsave(struct ieee80211com *, struct ieee80211_node *, 
+void	ieee80211_pwrsave(struct ieee80211com *, struct ieee80211_node *, 
 		struct mbuf *);
 
-extern	void ieee80211_reset_erp(struct ieee80211com *);
-extern	void ieee80211_set_shortslottime(struct ieee80211com *, int onoff);
-extern	int ieee80211_iserp_rateset(struct ieee80211com *,
+void	ieee80211_reset_erp(struct ieee80211com *);
+void	ieee80211_set_shortslottime(struct ieee80211com *, int onoff);
+int	ieee80211_iserp_rateset(struct ieee80211com *,
 		struct ieee80211_rateset *);
-extern	void ieee80211_set11gbasicrates(struct ieee80211_rateset *,
+void	ieee80211_set11gbasicrates(struct ieee80211_rateset *,
 		enum ieee80211_phymode);
 
 /*
@@ -131,11 +130,10 @@ struct ieee80211_authenticator {
 	void	(*ia_node_leave)(struct ieee80211com *,
 				struct ieee80211_node *);
 };
-extern	void ieee80211_authenticator_register(int type,
+void	ieee80211_authenticator_register(int type,
 		const struct ieee80211_authenticator *);
-extern	void ieee80211_authenticator_unregister(int type);
-extern	const struct ieee80211_authenticator *
-		ieee80211_authenticator_get(int auth);
+void	ieee80211_authenticator_unregister(int type);
+const struct ieee80211_authenticator *ieee80211_authenticator_get(int auth);
 
 /*
  * Template for an MAC ACL policy module.  Such modules
@@ -156,17 +154,16 @@ struct ieee80211_aclator {
 	int	(*iac_setpolicy)(struct ieee80211com *, int);
 	int	(*iac_getpolicy)(struct ieee80211com *);
 };
-extern	void ieee80211_aclator_register(const struct ieee80211_aclator *);
-extern	void ieee80211_aclator_unregister(const struct ieee80211_aclator *);
-extern	const struct ieee80211_aclator *ieee80211_aclator_get(const char *name);
+void	ieee80211_aclator_register(const struct ieee80211_aclator *);
+void	ieee80211_aclator_unregister(const struct ieee80211_aclator *);
+const struct ieee80211_aclator *ieee80211_aclator_get(const char *name);
 
 /* flags for ieee80211_fix_rate() */
 #define	IEEE80211_F_DOSORT	0x00000001	/* sort rate list */
 #define	IEEE80211_F_DOFRATE	0x00000002	/* use fixed rate */
 #define	IEEE80211_F_DONEGO	0x00000004	/* calc negotiated rate */
 #define	IEEE80211_F_DODEL	0x00000008	/* delete ignore rate */
-extern	int ieee80211_fix_rate(struct ieee80211com *,
-		struct ieee80211_node *, int);
+int	ieee80211_fix_rate(struct ieee80211com *, struct ieee80211_node *, int);
 
 /*
  * WME/WMM support.
@@ -203,14 +200,14 @@ struct ieee80211_wme_state {
 	int	(*wme_update)(struct ieee80211com *);
 };
 
-extern	void ieee80211_wme_initparams(struct ieee80211com *);
-extern	void ieee80211_wme_updateparams(struct ieee80211com *);
-extern	void ieee80211_wme_updateparams_locked(struct ieee80211com *);
+void	ieee80211_wme_initparams(struct ieee80211com *);
+void	ieee80211_wme_updateparams(struct ieee80211com *);
+void	ieee80211_wme_updateparams_locked(struct ieee80211com *);
 
 #define	ieee80211_new_state(_ic, _nstate, _arg) \
 	(((_ic)->ic_newstate)((_ic), (_nstate), (_arg)))
-extern	void ieee80211_print_essid(const u_int8_t *, int);
-extern	void ieee80211_dump_pkt(const u_int8_t *, int, int, int);
+void	ieee80211_print_essid(const u_int8_t *, int);
+void	ieee80211_dump_pkt(const u_int8_t *, int, int, int);
 
 extern	const char *ieee80211_state_name[IEEE80211_S_MAX];
 extern	const char *ieee80211_wme_acnames[];
@@ -228,9 +225,9 @@ struct ieee80211_beacon_offsets {
 	u_int16_t	bo_tim_len;	/* atim/dtim length in bytes */
 	u_int16_t	bo_trailer_len;	/* trailer length in bytes */
 };
-extern	struct mbuf *ieee80211_beacon_alloc(struct ieee80211com *,
+struct mbuf *ieee80211_beacon_alloc(struct ieee80211com *,
 		struct ieee80211_node *, struct ieee80211_beacon_offsets *);
-extern	int ieee80211_beacon_update(struct ieee80211com *,
+int	ieee80211_beacon_update(struct ieee80211com *,
 		struct ieee80211_node *, struct ieee80211_beacon_offsets *,
 		struct mbuf *, int broadcast);
 
@@ -239,9 +236,9 @@ extern	int ieee80211_beacon_update(struct ieee80211com *,
  * Note that while these are defined here, their implementation
  * is OS-specific.
  */
-extern	void ieee80211_notify_node_join(struct ieee80211com *,
+void	ieee80211_notify_node_join(struct ieee80211com *,
 		struct ieee80211_node *, int newassoc);
-extern	void ieee80211_notify_node_leave(struct ieee80211com *,
+void	ieee80211_notify_node_leave(struct ieee80211com *,
 		struct ieee80211_node *);
-extern	void ieee80211_notify_scan_done(struct ieee80211com *);
+void	ieee80211_notify_scan_done(struct ieee80211com *);
 #endif /* _NET80211_IEEE80211_PROTO_H_ */