Module Name: src
Committed By: christos
Date: Thu Apr 19 21:20:43 UTC 2018
Modified Files:
src/sys/net: bpf.h if.h if_arp.h if_ether.h if_gif.h if_ipsec.h
if_l2tp.h if_llatbl.h route.h
Log Message:
s/static inline/static __inline/g for consistency.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/net/bpf.h
cvs rdiff -u -r1.259 -r1.260 src/sys/net/if.h
cvs rdiff -u -r1.31 -r1.32 src/sys/net/if_arp.h
cvs rdiff -u -r1.71 -r1.72 src/sys/net/if_ether.h
cvs rdiff -u -r1.29 -r1.30 src/sys/net/if_gif.h
cvs rdiff -u -r1.1 -r1.2 src/sys/net/if_ipsec.h
cvs rdiff -u -r1.3 -r1.4 src/sys/net/if_l2tp.h
cvs rdiff -u -r1.14 -r1.15 src/sys/net/if_llatbl.h
cvs rdiff -u -r1.118 -r1.119 src/sys/net/route.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/bpf.h
diff -u src/sys/net/bpf.h:1.69 src/sys/net/bpf.h:1.70
--- src/sys/net/bpf.h:1.69 Tue Jan 24 20:04:23 2017
+++ src/sys/net/bpf.h Thu Apr 19 17:20:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.h,v 1.69 2017/01/25 01:04:23 ozaki-r Exp $ */
+/* $NetBSD: bpf.h,v 1.70 2018/04/19 21:20:43 christos Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -430,85 +430,85 @@ struct bpf_ops {
extern struct bpf_ops *bpf_ops;
-static inline void
+static __inline void
bpf_attach(struct ifnet *_ifp, u_int _dlt, u_int _hdrlen)
{
bpf_ops->bpf_attach(_ifp, _dlt, _hdrlen, &_ifp->if_bpf);
}
-static inline void
+static __inline void
bpf_attach2(struct ifnet *_ifp, u_int _dlt, u_int _hdrlen, struct bpf_if **_dp)
{
bpf_ops->bpf_attach(_ifp, _dlt, _hdrlen, _dp);
}
-static inline void
+static __inline void
bpf_tap(struct ifnet *_ifp, u_char *_pkt, u_int _len)
{
if (_ifp->if_bpf)
bpf_ops->bpf_tap(_ifp->if_bpf, _pkt, _len);
}
-static inline void
+static __inline void
bpf_mtap(struct ifnet *_ifp, struct mbuf *_m)
{
if (_ifp->if_bpf)
bpf_ops->bpf_mtap(_ifp->if_bpf, _m);
}
-static inline void
+static __inline void
bpf_mtap2(struct bpf_if *_bpf, void *_data, u_int _dlen, struct mbuf *_m)
{
bpf_ops->bpf_mtap2(_bpf, _data, _dlen, _m);
}
-static inline void
+static __inline void
bpf_mtap3(struct bpf_if *_bpf, struct mbuf *_m)
{
if (_bpf)
bpf_ops->bpf_mtap(_bpf, _m);
}
-static inline void
+static __inline void
bpf_mtap_af(struct ifnet *_ifp, uint32_t _af, struct mbuf *_m)
{
if (_ifp->if_bpf)
bpf_ops->bpf_mtap_af(_ifp->if_bpf, _af, _m);
}
-static inline void
+static __inline void
bpf_change_type(struct ifnet *_ifp, u_int _dlt, u_int _hdrlen)
{
bpf_ops->bpf_change_type(_ifp, _dlt, _hdrlen);
}
-static inline void
+static __inline void
bpf_detach(struct ifnet *_ifp)
{
bpf_ops->bpf_detach(_ifp);
}
-static inline void
+static __inline void
bpf_mtap_sl_in(struct ifnet *_ifp, u_char *_hdr, struct mbuf **_m)
{
bpf_ops->bpf_mtap_sl_in(_ifp->if_bpf, _hdr, _m);
}
-static inline void
+static __inline void
bpf_mtap_sl_out(struct ifnet *_ifp, u_char *_hdr, struct mbuf *_m)
{
if (_ifp->if_bpf)
bpf_ops->bpf_mtap_sl_out(_ifp->if_bpf, _hdr, _m);
}
-static inline void
+static __inline void
bpf_mtap_softint_init(struct ifnet *_ifp)
{
bpf_ops->bpf_mtap_softint_init(_ifp);
}
-static inline void
+static __inline void
bpf_mtap_softint(struct ifnet *_ifp, struct mbuf *_m)
{
Index: src/sys/net/if.h
diff -u src/sys/net/if.h:1.259 src/sys/net/if.h:1.260
--- src/sys/net/if.h:1.259 Thu Apr 12 00:38:13 2018
+++ src/sys/net/if.h Thu Apr 19 17:20:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if.h,v 1.259 2018/04/12 04:38:13 ozaki-r Exp $ */
+/* $NetBSD: if.h,v 1.260 2018/04/19 21:20:43 christos Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -467,14 +467,14 @@ typedef struct ifnet {
*/
#ifdef _KERNEL
-static inline bool
+static __inline bool
if_is_mpsafe(struct ifnet *ifp)
{
return ((ifp->if_extflags & IFEF_MPSAFE) != 0);
}
-static inline int
+static __inline int
if_output_lock(struct ifnet *cifp, struct ifnet *ifp, struct mbuf *m,
const struct sockaddr *dst, const struct rtentry *rt)
{
@@ -491,7 +491,7 @@ if_output_lock(struct ifnet *cifp, struc
}
}
-static inline void
+static __inline void
if_start_lock(struct ifnet *ifp)
{
@@ -504,7 +504,7 @@ if_start_lock(struct ifnet *ifp)
}
}
-static inline bool
+static __inline bool
if_is_link_state_changeable(struct ifnet *ifp)
{
@@ -833,7 +833,7 @@ struct ifreq {
#define ifreq_getdstaddr ifreq_getaddr
#define ifreq_getbroadaddr ifreq_getaddr
-static inline const struct sockaddr *
+static __inline const struct sockaddr *
/*ARGSUSED*/
ifreq_getaddr(u_long cmd, const struct ifreq *ifr)
{
@@ -1104,7 +1104,7 @@ void if_acquire(struct ifnet *, struct p
int if_tunnel_check_nesting(struct ifnet *, struct mbuf *, int);
-static inline if_index_t
+static __inline if_index_t
if_get_index(const struct ifnet *ifp)
{
Index: src/sys/net/if_arp.h
diff -u src/sys/net/if_arp.h:1.31 src/sys/net/if_arp.h:1.32
--- src/sys/net/if_arp.h:1.31 Tue Feb 13 03:43:26 2018
+++ src/sys/net/if_arp.h Thu Apr 19 17:20:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.h,v 1.31 2018/02/13 08:43:26 maxv Exp $ */
+/* $NetBSD: if_arp.h,v 1.32 2018/04/19 21:20:43 christos Exp $ */
/*
* Copyright (c) 1986, 1993
@@ -73,19 +73,19 @@ struct arphdr {
#endif
} __packed;
-static inline uint8_t *
+static __inline uint8_t *
ar_sha(struct arphdr *ap)
{
return ((uint8_t *)(ap + 1)) + 0;
}
-static inline uint8_t *
+static __inline uint8_t *
ar_spa(struct arphdr *ap)
{
return ((uint8_t *)(ap + 1)) + ap->ar_hln;
}
-static inline uint8_t *
+static __inline uint8_t *
ar_tha(struct arphdr *ap)
{
if (ntohs(ap->ar_hrd) == ARPHRD_IEEE1394) {
@@ -95,7 +95,7 @@ ar_tha(struct arphdr *ap)
}
}
-static inline uint8_t *
+static __inline uint8_t *
ar_tpa(struct arphdr *ap)
{
if (ntohs(ap->ar_hrd) == ARPHRD_IEEE1394) {
Index: src/sys/net/if_ether.h
diff -u src/sys/net/if_ether.h:1.71 src/sys/net/if_ether.h:1.72
--- src/sys/net/if_ether.h:1.71 Mon Jan 15 11:36:51 2018
+++ src/sys/net/if_ether.h Thu Apr 19 17:20:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ether.h,v 1.71 2018/01/15 16:36:51 maxv Exp $ */
+/* $NetBSD: if_ether.h,v 1.72 2018/04/19 21:20:43 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -298,7 +298,7 @@ struct ether_multistep {
*/
/* add VLAN tag to input/received packet */
-static inline void
+static __inline void
vlan_set_tag(struct mbuf *m, uint16_t vlantag)
{
/* VLAN tag contains priority, CFI and VLAN ID */
@@ -308,14 +308,14 @@ vlan_set_tag(struct mbuf *m, uint16_t vl
return;
}
-static inline bool
+static __inline bool
vlan_has_tag(struct mbuf *m)
{
return (m->m_flags & M_VLANTAG) != 0;
}
/* extract VLAN ID value from a VLAN tag */
-static inline uint16_t
+static __inline uint16_t
vlan_get_tag(struct mbuf *m)
{
KASSERT((m->m_flags & M_PKTHDR) != 0);
Index: src/sys/net/if_gif.h
diff -u src/sys/net/if_gif.h:1.29 src/sys/net/if_gif.h:1.30
--- src/sys/net/if_gif.h:1.29 Mon Nov 27 00:03:11 2017
+++ src/sys/net/if_gif.h Thu Apr 19 17:20:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gif.h,v 1.29 2017/11/27 05:03:11 knakahara Exp $ */
+/* $NetBSD: if_gif.h,v 1.30 2018/04/19 21:20:43 christos Exp $ */
/* $KAME: if_gif.h,v 1.23 2001/07/27 09:21:42 itojun Exp $ */
/*
@@ -95,7 +95,7 @@ struct gif_softc {
* Once a reader dereference sc->sc_var by this API, the reader must not
* re-dereference form sc->sc_var.
*/
-static inline struct gif_variant *
+static __inline struct gif_variant *
gif_getref_variant(struct gif_softc *sc, struct psref *psref)
{
struct gif_variant *var;
@@ -111,7 +111,7 @@ gif_getref_variant(struct gif_softc *sc,
return var;
}
-static inline void
+static __inline void
gif_putref_variant(struct gif_variant *var, struct psref *psref)
{
@@ -119,7 +119,7 @@ gif_putref_variant(struct gif_variant *v
psref_release(psref, &var->gv_psref, gv_psref_class);
}
-static inline bool
+static __inline bool
gif_heldref_variant(struct gif_variant *var)
{
Index: src/sys/net/if_ipsec.h
diff -u src/sys/net/if_ipsec.h:1.1 src/sys/net/if_ipsec.h:1.2
--- src/sys/net/if_ipsec.h:1.1 Wed Jan 10 05:56:30 2018
+++ src/sys/net/if_ipsec.h Thu Apr 19 17:20:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ipsec.h,v 1.1 2018/01/10 10:56:30 knakahara Exp $ */
+/* $NetBSD: if_ipsec.h,v 1.2 2018/04/19 21:20:43 christos Exp $ */
/*
* Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -111,21 +111,21 @@ struct ipsec_softc {
#define IV_SP_OUT(x) ((x)->iv_sp[IPSEC_DIR_OUTBOUND])
#define IV_SP_OUT6(x) ((x)->iv_sp6[IPSEC_DIR_OUTBOUND])
-static inline bool
+static __inline bool
if_ipsec_variant_is_configured(struct ipsec_variant *var)
{
return (var->iv_psrc != NULL && var->iv_pdst != NULL);
}
-static inline bool
+static __inline bool
if_ipsec_variant_is_unconfigured(struct ipsec_variant *var)
{
return (var->iv_psrc == NULL || var->iv_pdst == NULL);
}
-static inline void
+static __inline void
if_ipsec_copy_variant(struct ipsec_variant *dst, struct ipsec_variant *src)
{
@@ -139,7 +139,7 @@ if_ipsec_copy_variant(struct ipsec_varia
dst->iv_dport = src->iv_dport;
}
-static inline void
+static __inline void
if_ipsec_clear_config(struct ipsec_variant *var)
{
@@ -160,7 +160,7 @@ if_ipsec_clear_config(struct ipsec_varia
* Once a reader dereference sc->sc_var by this API, the reader must not
* re-dereference from sc->sc_var.
*/
-static inline struct ipsec_variant *
+static __inline struct ipsec_variant *
if_ipsec_getref_variant(struct ipsec_softc *sc, struct psref *psref)
{
struct ipsec_variant *var;
@@ -176,7 +176,7 @@ if_ipsec_getref_variant(struct ipsec_sof
return var;
}
-static inline void
+static __inline void
if_ipsec_putref_variant(struct ipsec_variant *var, struct psref *psref)
{
@@ -184,7 +184,7 @@ if_ipsec_putref_variant(struct ipsec_var
psref_release(psref, &var->iv_psref, iv_psref_class);
}
-static inline bool
+static __inline bool
if_ipsec_heldref_variant(struct ipsec_variant *var)
{
Index: src/sys/net/if_l2tp.h
diff -u src/sys/net/if_l2tp.h:1.3 src/sys/net/if_l2tp.h:1.4
--- src/sys/net/if_l2tp.h:1.3 Mon Oct 30 07:24:04 2017
+++ src/sys/net/if_l2tp.h Thu Apr 19 17:20:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_l2tp.h,v 1.3 2017/10/30 11:24:04 knakahara Exp $ */
+/* $NetBSD: if_l2tp.h,v 1.4 2018/04/19 21:20:43 christos Exp $ */
/*
* Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -124,7 +124,7 @@ struct l2tp_softc {
* So, once a reader dereference sc->sc_var by this API, the reader must not
* re-dereference form sc->sc_var.
*/
-static inline struct l2tp_variant *
+static __inline struct l2tp_variant *
l2tp_getref_variant(struct l2tp_softc *sc, struct psref *psref)
{
struct l2tp_variant *var;
@@ -143,7 +143,7 @@ l2tp_getref_variant(struct l2tp_softc *s
return var;
}
-static inline void
+static __inline void
l2tp_putref_variant(struct l2tp_variant *var, struct psref *psref)
{
@@ -152,7 +152,7 @@ l2tp_putref_variant(struct l2tp_variant
psref_release(psref, &var->lv_psref, lv_psref_class);
}
-static inline bool
+static __inline bool
l2tp_heldref_variant(struct l2tp_variant *var)
{
Index: src/sys/net/if_llatbl.h
diff -u src/sys/net/if_llatbl.h:1.14 src/sys/net/if_llatbl.h:1.15
--- src/sys/net/if_llatbl.h:1.14 Tue Mar 6 02:27:55 2018
+++ src/sys/net/if_llatbl.h Thu Apr 19 17:20:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_llatbl.h,v 1.14 2018/03/06 07:27:55 ozaki-r Exp $ */
+/* $NetBSD: if_llatbl.h,v 1.15 2018/04/19 21:20:43 christos Exp $ */
/*
* Copyright (c) 2004 Luigi Rizzo, Alessandro Cerri. All rights reserved.
* Copyright (c) 2004-2008 Qing Li. All rights reserved.
@@ -281,7 +281,7 @@ void lltable_fill_sa_entry(const struct
struct ifnet *lltable_get_ifp(const struct lltable *llt);
int lltable_get_af(const struct lltable *llt);
-static inline unsigned int
+static __inline unsigned int
lltable_get_entry_count(struct lltable *llt)
{
return llt->llt_lle_count;
Index: src/sys/net/route.h
diff -u src/sys/net/route.h:1.118 src/sys/net/route.h:1.119
--- src/sys/net/route.h:1.118 Thu Apr 12 00:38:13 2018
+++ src/sys/net/route.h Thu Apr 19 17:20:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: route.h,v 1.118 2018/04/12 04:38:13 ozaki-r Exp $ */
+/* $NetBSD: route.h,v 1.119 2018/04/19 21:20:43 christos Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -129,7 +129,7 @@ struct rtentry {
#endif
};
-static inline const struct sockaddr *
+static __inline const struct sockaddr *
rt_getkey(const struct rtentry *rt)
{
return rt->_rt_key;
@@ -448,7 +448,7 @@ void rt_delete_matched_entries(sa_family
int (*)(struct rtentry *, void *), void *);
int rt_walktree(sa_family_t, int (*)(struct rtentry *, void *), void *);
-static inline void
+static __inline void
rt_assert_referenced(const struct rtentry *rt)
{
@@ -468,14 +468,14 @@ int rtcache_setdst(struct route *, const
struct rtentry *
rtcache_update(struct route *, int);
-static inline void
+static __inline void
rtcache_invariants(const struct route *ro)
{
KASSERT(ro->ro_sa != NULL || ro->_ro_rt == NULL);
}
-static inline struct rtentry *
+static __inline struct rtentry *
rtcache_lookup1(struct route *ro, const struct sockaddr *dst, int clone)
{
int hit;
@@ -483,13 +483,13 @@ rtcache_lookup1(struct route *ro, const
return rtcache_lookup2(ro, dst, clone, &hit);
}
-static inline struct rtentry *
+static __inline struct rtentry *
rtcache_lookup(struct route *ro, const struct sockaddr *dst)
{
return rtcache_lookup1(ro, dst, 1);
}
-static inline const struct sockaddr *
+static __inline const struct sockaddr *
rtcache_getdst(const struct route *ro)
{
