Module Name: src
Committed By: christos
Date: Thu Apr 19 21:22:02 UTC 2018
Modified Files:
src/sys/netinet6: in6.h in6_var.h
Log Message:
s/static inline/static __inline/g for consistency.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/netinet6/in6.h
cvs rdiff -u -r1.97 -r1.98 src/sys/netinet6/in6_var.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/netinet6/in6.h
diff -u src/sys/netinet6/in6.h:1.90 src/sys/netinet6/in6.h:1.91
--- src/sys/netinet6/in6.h:1.90 Fri Feb 9 13:31:52 2018
+++ src/sys/netinet6/in6.h Thu Apr 19 17:22:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.h,v 1.90 2018/02/09 18:31:52 maxv Exp $ */
+/* $NetBSD: in6.h,v 1.91 2018/04/19 21:22:02 christos Exp $ */
/* $KAME: in6.h,v 1.83 2001/03/29 02:55:07 jinmei Exp $ */
/*
@@ -720,7 +720,7 @@ int in6_tunnel_validate(const struct ip6
#define sin6tocsa(sin6) ((const struct sockaddr *)(sin6))
#define ifatoia6(ifa) ((struct in6_ifaddr *)(ifa))
-static inline void
+static __inline void
sockaddr_in6_init1(struct sockaddr_in6 *sin6, const struct in6_addr *addr,
in_port_t port, uint32_t flowinfo, uint32_t scope_id)
{
@@ -730,7 +730,7 @@ sockaddr_in6_init1(struct sockaddr_in6 *
sin6->sin6_scope_id = scope_id;
}
-static inline void
+static __inline void
sockaddr_in6_init(struct sockaddr_in6 *sin6, const struct in6_addr *addr,
in_port_t port, uint32_t flowinfo, uint32_t scope_id)
{
@@ -739,7 +739,7 @@ sockaddr_in6_init(struct sockaddr_in6 *s
sockaddr_in6_init1(sin6, addr, port, flowinfo, scope_id);
}
-static inline struct sockaddr *
+static __inline struct sockaddr *
sockaddr_in6_alloc(const struct in6_addr *addr, in_port_t port,
uint32_t flowinfo, uint32_t scope_id, int flags)
{
Index: src/sys/netinet6/in6_var.h
diff -u src/sys/netinet6/in6_var.h:1.97 src/sys/netinet6/in6_var.h:1.98
--- src/sys/netinet6/in6_var.h:1.97 Thu Mar 2 04:48:20 2017
+++ src/sys/netinet6/in6_var.h Thu Apr 19 17:22:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_var.h,v 1.97 2017/03/02 09:48:20 ozaki-r Exp $ */
+/* $NetBSD: in6_var.h,v 1.98 2018/04/19 21:22:02 christos Exp $ */
/* $KAME: in6_var.h,v 1.81 2002/06/08 11:16:51 itojun Exp $ */
/*
@@ -136,7 +136,7 @@ struct in6_ifaddr {
};
#ifdef _KERNEL
-static inline void
+static __inline void
ia6_acquire(struct in6_ifaddr *ia, struct psref *psref)
{
@@ -144,7 +144,7 @@ ia6_acquire(struct in6_ifaddr *ia, struc
ifa_acquire(&ia->ia_ifa, psref);
}
-static inline void
+static __inline void
ia6_release(struct in6_ifaddr *ia, struct psref *psref)
{
@@ -590,7 +590,7 @@ extern callout_t in6_tmpaddrtimer_ch;
* Macro for finding the internet address structure (in6_ifaddr) corresponding
* to a given interface (ifnet structure).
*/
-static inline struct in6_ifaddr *
+static __inline struct in6_ifaddr *
in6_get_ia_from_ifp(struct ifnet *ifp)
{
struct ifaddr *ifa;
@@ -602,7 +602,7 @@ in6_get_ia_from_ifp(struct ifnet *ifp)
return (struct in6_ifaddr *)ifa;
}
-static inline struct in6_ifaddr *
+static __inline struct in6_ifaddr *
in6_get_ia_from_ifp_psref(struct ifnet *ifp, struct psref *psref)
{
struct in6_ifaddr *ia;
@@ -653,7 +653,7 @@ struct in6_multi {
* address on a given interface. If no matching record is found, "imm"
* returns NULL.
*/
-static inline struct in6_multi_mship *
+static __inline struct in6_multi_mship *
in6_lookup_mship(struct in6_addr *addr, struct ifnet *ifp,
struct ip6_moptions *imop)
{
