Module Name: src
Committed By: riastradh
Date: Thu Feb 4 02:48:37 UTC 2016
Modified Files:
src/sys/netinet6: in6_var.h ip6_input.c nd6.c
Log Message:
Declare in6_tmpaddrtimer_ch in in6_var.h.
Do not declare extern variables in .c files!
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/netinet6/in6_var.h
cvs rdiff -u -r1.154 -r1.155 src/sys/netinet6/ip6_input.c
cvs rdiff -u -r1.184 -r1.185 src/sys/netinet6/nd6.c
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_var.h
diff -u src/sys/netinet6/in6_var.h:1.75 src/sys/netinet6/in6_var.h:1.76
--- src/sys/netinet6/in6_var.h:1.75 Wed Nov 25 06:21:26 2015
+++ src/sys/netinet6/in6_var.h Thu Feb 4 02:48:37 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_var.h,v 1.75 2015/11/25 06:21:26 ozaki-r Exp $ */
+/* $NetBSD: in6_var.h,v 1.76 2016/02/04 02:48:37 riastradh Exp $ */
/* $KAME: in6_var.h,v 1.81 2002/06/08 11:16:51 itojun Exp $ */
/*
@@ -502,6 +502,7 @@ extern const struct in6_addr zeroin6_add
extern const u_char inet6ctlerrmap[];
extern unsigned long in6_maxmtu;
extern bool in6_present;
+extern callout_t in6_tmpaddrtimer_ch;
/*
* Macro for finding the internet address structure (in6_ifaddr) corresponding
Index: src/sys/netinet6/ip6_input.c
diff -u src/sys/netinet6/ip6_input.c:1.154 src/sys/netinet6/ip6_input.c:1.155
--- src/sys/netinet6/ip6_input.c:1.154 Fri Jan 8 03:55:39 2016
+++ src/sys/netinet6/ip6_input.c Thu Feb 4 02:48:37 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_input.c,v 1.154 2016/01/08 03:55:39 knakahara Exp $ */
+/* $NetBSD: ip6_input.c,v 1.155 2016/02/04 02:48:37 riastradh 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.154 2016/01/08 03:55:39 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.155 2016/02/04 02:48:37 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_gateway.h"
@@ -136,8 +136,6 @@ u_char ip6_protox[IPPROTO_MAX];
struct in6_ifaddr *in6_ifaddr;
pktqueue_t *ip6_pktq __read_mostly;
-extern callout_t in6_tmpaddrtimer_ch;
-
int ip6_forward_srcrt; /* XXX */
int ip6_sourcecheck; /* XXX */
int ip6_sourcecheck_interval; /* XXX */
Index: src/sys/netinet6/nd6.c
diff -u src/sys/netinet6/nd6.c:1.184 src/sys/netinet6/nd6.c:1.185
--- src/sys/netinet6/nd6.c:1.184 Fri Jan 8 08:50:07 2016
+++ src/sys/netinet6/nd6.c Thu Feb 4 02:48:37 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.c,v 1.184 2016/01/08 08:50:07 ozaki-r Exp $ */
+/* $NetBSD: nd6.c,v 1.185 2016/02/04 02:48:37 riastradh Exp $ */
/* $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.184 2016/01/08 08:50:07 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.185 2016/02/04 02:48:37 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -127,7 +127,6 @@ static void clear_llinfo_pqueue(struct l
callout_t nd6_slowtimo_ch;
callout_t nd6_timer_ch;
-extern callout_t in6_tmpaddrtimer_ch;
static int fill_drlist(void *, size_t *, size_t);
static int fill_prlist(void *, size_t *, size_t);
