Switch around the order of static inline to be in line with how it's

used elsewhere, and to keep gcc-4.7 happy.

This is a request from the DragonflyBSD project.
This commit is contained in:
Adrian Chadd 2015-01-11 18:43:45 +00:00
parent bffed0e9c8
commit 21969c6c24

View File

@ -62,13 +62,13 @@ void ieee80211_ratectl_set(struct ieee80211vap *, int);
MALLOC_DECLARE(M_80211_RATECTL); MALLOC_DECLARE(M_80211_RATECTL);
static void __inline static __inline void
ieee80211_ratectl_deinit(struct ieee80211vap *vap) ieee80211_ratectl_deinit(struct ieee80211vap *vap)
{ {
vap->iv_rate->ir_deinit(vap); vap->iv_rate->ir_deinit(vap);
} }
static void __inline static __inline void
ieee80211_ratectl_node_init(struct ieee80211_node *ni) ieee80211_ratectl_node_init(struct ieee80211_node *ni)
{ {
const struct ieee80211vap *vap = ni->ni_vap; const struct ieee80211vap *vap = ni->ni_vap;
@ -76,7 +76,7 @@ ieee80211_ratectl_node_init(struct ieee80211_node *ni)
vap->iv_rate->ir_node_init(ni); vap->iv_rate->ir_node_init(ni);
} }
static void __inline static __inline void
ieee80211_ratectl_node_deinit(struct ieee80211_node *ni) ieee80211_ratectl_node_deinit(struct ieee80211_node *ni)
{ {
const struct ieee80211vap *vap = ni->ni_vap; const struct ieee80211vap *vap = ni->ni_vap;
@ -92,14 +92,14 @@ ieee80211_ratectl_rate(struct ieee80211_node *ni, void *arg, uint32_t iarg)
return vap->iv_rate->ir_rate(ni, arg, iarg); return vap->iv_rate->ir_rate(ni, arg, iarg);
} }
static void __inline static __inline void
ieee80211_ratectl_tx_complete(const struct ieee80211vap *vap, ieee80211_ratectl_tx_complete(const struct ieee80211vap *vap,
const struct ieee80211_node *ni, int status, void *arg1, void *arg2) const struct ieee80211_node *ni, int status, void *arg1, void *arg2)
{ {
vap->iv_rate->ir_tx_complete(vap, ni, status, arg1, arg2); vap->iv_rate->ir_tx_complete(vap, ni, status, arg1, arg2);
} }
static void __inline static __inline void
ieee80211_ratectl_tx_update(const struct ieee80211vap *vap, ieee80211_ratectl_tx_update(const struct ieee80211vap *vap,
const struct ieee80211_node *ni, void *arg1, void *arg2, void *arg3) const struct ieee80211_node *ni, void *arg1, void *arg2, void *arg3)
{ {
@ -108,7 +108,7 @@ ieee80211_ratectl_tx_update(const struct ieee80211vap *vap,
vap->iv_rate->ir_tx_update(vap, ni, arg1, arg2, arg3); vap->iv_rate->ir_tx_update(vap, ni, arg1, arg2, arg3);
} }
static void __inline static __inline void
ieee80211_ratectl_setinterval(const struct ieee80211vap *vap, int msecs) ieee80211_ratectl_setinterval(const struct ieee80211vap *vap, int msecs)
{ {
if (vap->iv_rate->ir_setinterval == NULL) if (vap->iv_rate->ir_setinterval == NULL)