Module Name: src
Committed By: maxv
Date: Fri Jun 19 16:08:06 UTC 2020
Modified Files:
src/sys/netinet6: ip6_input.c ip6_var.h
Log Message:
localify
To generate a diff of this commit:
cvs rdiff -u -r1.216 -r1.217 src/sys/netinet6/ip6_input.c
cvs rdiff -u -r1.83 -r1.84 src/sys/netinet6/ip6_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/ip6_input.c
diff -u src/sys/netinet6/ip6_input.c:1.216 src/sys/netinet6/ip6_input.c:1.217
--- src/sys/netinet6/ip6_input.c:1.216 Fri Jun 12 11:04:45 2020
+++ src/sys/netinet6/ip6_input.c Fri Jun 19 16:08:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_input.c,v 1.216 2020/06/12 11:04:45 roy Exp $ */
+/* $NetBSD: ip6_input.c,v 1.217 2020/06/19 16:08:06 maxv Exp $ */
/* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.216 2020/06/12 11:04:45 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.217 2020/06/19 16:08:06 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_gateway.h"
@@ -135,9 +135,14 @@ percpu_t *ip6stat_percpu;
percpu_t *ip6_forward_rt_percpu __cacheline_aligned;
static void ip6intr(void *);
+static void ip6_input(struct mbuf *, struct ifnet *);
static bool ip6_badaddr(struct ip6_hdr *);
static struct m_tag *ip6_setdstifaddr(struct mbuf *, const struct in6_ifaddr *);
+static struct m_tag *ip6_addaux(struct mbuf *);
+static struct m_tag *ip6_findaux(struct mbuf *);
+static void ip6_delaux(struct mbuf *);
+
static int ip6_process_hopopts(struct mbuf *, u_int8_t *, int, u_int32_t *,
u_int32_t *);
static struct mbuf *ip6_pullexthdr(struct mbuf *, size_t, int);
@@ -225,7 +230,7 @@ ip6intr(void *arg __unused)
SOFTNET_KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
}
-void
+static void
ip6_input(struct mbuf *m, struct ifnet *rcvif)
{
struct ip6_hdr *ip6;
@@ -1479,7 +1484,7 @@ ip6_lasthdr(struct mbuf *m, int off, int
}
}
-struct m_tag *
+static struct m_tag *
ip6_addaux(struct mbuf *m)
{
struct m_tag *mtag;
@@ -1496,7 +1501,7 @@ ip6_addaux(struct mbuf *m)
return mtag;
}
-struct m_tag *
+static struct m_tag *
ip6_findaux(struct mbuf *m)
{
struct m_tag *mtag;
@@ -1505,7 +1510,7 @@ ip6_findaux(struct mbuf *m)
return mtag;
}
-void
+static void
ip6_delaux(struct mbuf *m)
{
struct m_tag *mtag;
Index: src/sys/netinet6/ip6_var.h
diff -u src/sys/netinet6/ip6_var.h:1.83 src/sys/netinet6/ip6_var.h:1.84
--- src/sys/netinet6/ip6_var.h:1.83 Fri Jun 12 11:04:45 2020
+++ src/sys/netinet6/ip6_var.h Fri Jun 19 16:08:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_var.h,v 1.83 2020/06/12 11:04:45 roy Exp $ */
+/* $NetBSD: ip6_var.h,v 1.84 2020/06/19 16:08:06 maxv Exp $ */
/* $KAME: ip6_var.h,v 1.33 2000/06/11 14:59:20 jinmei Exp $ */
/*
@@ -276,7 +276,6 @@ int icmp6_ctloutput(int, struct socket *
struct mbuf;
void ip6_init(void);
-void ip6_input(struct mbuf *, struct ifnet *);
const struct ip6aux *ip6_getdstifaddr(struct mbuf *);
void ip6_freepcbopts(struct ip6_pktopts *);
void ip6_freemoptions(struct ip6_moptions *);
@@ -285,9 +284,6 @@ int ip6_get_prevhdr(struct mbuf *, int);
int ip6_nexthdr(struct mbuf *, int, int, int *);
int ip6_lasthdr(struct mbuf *, int, int, int *);
-struct m_tag *ip6_addaux(struct mbuf *);
-struct m_tag *ip6_findaux(struct mbuf *);
-void ip6_delaux(struct mbuf *);
struct ip6_hdr;
int ip6_mforward(struct ip6_hdr *, struct ifnet *, struct mbuf *);
int ip6_hopopts_input(u_int32_t *, u_int32_t *, struct mbuf **, int *);
