Module Name: src
Committed By: knakahara
Date: Tue May 31 03:52:40 UTC 2016
Modified Files:
src/sys/net: if_gif.c if_gif.h
Log Message:
modify some functions static. no functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/sys/net/if_gif.c
cvs rdiff -u -r1.22 -r1.23 src/sys/net/if_gif.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/if_gif.c
diff -u src/sys/net/if_gif.c:1.108 src/sys/net/if_gif.c:1.109
--- src/sys/net/if_gif.c:1.108 Thu Apr 28 00:16:56 2016
+++ src/sys/net/if_gif.c Tue May 31 03:52:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gif.c,v 1.108 2016/04/28 00:16:56 ozaki-r Exp $ */
+/* $NetBSD: if_gif.c,v 1.109 2016/05/31 03:52:40 knakahara Exp $ */
/* $KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.108 2016/04/28 00:16:56 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.109 2016/05/31 03:52:40 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -92,6 +92,14 @@ static void gifintr(void *);
*/
static LIST_HEAD(, gif_softc) gif_softc_list;
+static void gifattach0(struct gif_softc *);
+static int gif_output(struct ifnet *, struct mbuf *,
+ const struct sockaddr *, const struct rtentry *);
+static int gif_ioctl(struct ifnet *, u_long, void *);
+static int gif_set_tunnel(struct ifnet *, struct sockaddr *,
+ struct sockaddr *);
+static void gif_delete_tunnel(struct ifnet *);
+
static void gif_sysctl_setup(struct sysctllog **);
static int gif_clone_create(struct if_clone *, int);
@@ -169,7 +177,7 @@ gif_clone_create(struct if_clone *ifc, i
return (0);
}
-void
+static void
gifattach0(struct gif_softc *sc)
{
@@ -304,7 +312,7 @@ gif_check_nesting(struct ifnet *ifp, str
return 0;
}
-int
+static int
gif_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
const struct rtentry *rt)
{
@@ -488,7 +496,7 @@ gif_input(struct mbuf *m, int af, struct
}
/* XXX how should we handle IPv6 scope on SIOC[GS]IFPHYADDR? */
-int
+static int
gif_ioctl(struct ifnet *ifp, u_long cmd, void *data)
{
struct gif_softc *sc = ifp->if_softc;
@@ -775,7 +783,7 @@ gif_encap_detach(struct gif_softc *sc)
return error;
}
-int
+static int
gif_set_tunnel(struct ifnet *ifp, struct sockaddr *src, struct sockaddr *dst)
{
struct gif_softc *sc = ifp->if_softc;
@@ -903,7 +911,7 @@ gif_set_tunnel(struct ifnet *ifp, struct
return error;
}
-void
+static void
gif_delete_tunnel(struct ifnet *ifp)
{
struct gif_softc *sc = ifp->if_softc;
Index: src/sys/net/if_gif.h
diff -u src/sys/net/if_gif.h:1.22 src/sys/net/if_gif.h:1.23
--- src/sys/net/if_gif.h:1.22 Thu Apr 28 00:16:56 2016
+++ src/sys/net/if_gif.h Tue May 31 03:52:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gif.h,v 1.22 2016/04/28 00:16:56 ozaki-r Exp $ */
+/* $NetBSD: if_gif.h,v 1.23 2016/05/31 03:52:40 knakahara Exp $ */
/* $KAME: if_gif.h,v 1.23 2001/07/27 09:21:42 itojun Exp $ */
/*
@@ -70,13 +70,8 @@ struct gif_softc {
#define GIF_MTU_MAX (8192) /* Maximum MTU */
/* Prototypes */
-void gifattach0(struct gif_softc *);
void gif_input(struct mbuf *, int, struct ifnet *);
-int gif_output(struct ifnet *, struct mbuf *,
- const struct sockaddr *, const struct rtentry *);
-int gif_ioctl(struct ifnet *, u_long, void *);
-int gif_set_tunnel(struct ifnet *, struct sockaddr *, struct sockaddr *);
-void gif_delete_tunnel(struct ifnet *);
+
#ifdef GIF_ENCAPCHECK
int gif_encapcheck(struct mbuf *, int, int, void *);
#endif
