[src/trunk]: src/sys/netinet6 in6: reset the temporary address timer on a cha...

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7ab96075ff79
branches:  trunk
changeset: 845841:7ab96075ff79
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Fri Oct 18 04:33:53 2019 +0000

description:
in6: reset the temporary address timer on a change of the interval period

diffstat:

 sys/netinet6/in6_ifattach.c |  7 +++----
 sys/netinet6/in6_var.h      |  4 +++-
 sys/netinet6/ip6_input.c    |  6 ++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diffs (80 lines):

diff -r 949405b57542 -r 7ab96075ff79 sys/netinet6/in6_ifattach.c
--- a/sys/netinet6/in6_ifattach.c       Fri Oct 18 04:13:56 2019 +0000
+++ b/sys/netinet6/in6_ifattach.c       Fri Oct 18 04:33:53 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6_ifattach.c,v 1.116 2019/10/16 07:40:40 ozaki-r Exp $       */
+/*     $NetBSD: in6_ifattach.c,v 1.117 2019/10/18 04:33:53 ozaki-r Exp $       */
 /*     $KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $  */
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.116 2019/10/16 07:40:40 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.117 2019/10/18 04:33:53 ozaki-r Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -75,7 +75,6 @@
 static int in6_ifattach_linklocal(struct ifnet *, struct ifnet *);
 static int in6_ifattach_loopback(struct ifnet *);
 
-static void in6_tmpaddrtimer_schedule(void);
 static void in6_tmpaddrtimer(void *);
 
 #define EUI64_GBIT     0x01
@@ -861,7 +860,7 @@
        in6_tmpaddrtimer_schedule();
 }
 
-static void
+void
 in6_tmpaddrtimer_schedule(void)
 {
 
diff -r 949405b57542 -r 7ab96075ff79 sys/netinet6/in6_var.h
--- a/sys/netinet6/in6_var.h    Fri Oct 18 04:13:56 2019 +0000
+++ b/sys/netinet6/in6_var.h    Fri Oct 18 04:33:53 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6_var.h,v 1.101 2019/10/16 07:40:40 ozaki-r Exp $    */
+/*     $NetBSD: in6_var.h,v 1.102 2019/10/18 04:33:53 ozaki-r Exp $    */
 /*     $KAME: in6_var.h,v 1.81 2002/06/08 11:16:51 itojun Exp $        */
 
 /*
@@ -734,6 +734,8 @@
 
 void   in6_sysctl_multicast_setup(struct sysctllog **);
 
+void   in6_tmpaddrtimer_schedule(void);
+
 #endif /* _KERNEL */
 
 #endif /* !_NETINET6_IN6_VAR_H_ */
diff -r 949405b57542 -r 7ab96075ff79 sys/netinet6/ip6_input.c
--- a/sys/netinet6/ip6_input.c  Fri Oct 18 04:13:56 2019 +0000
+++ b/sys/netinet6/ip6_input.c  Fri Oct 18 04:33:53 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip6_input.c,v 1.213 2019/10/16 07:41:28 ozaki-r Exp $  */
+/*     $NetBSD: ip6_input.c,v 1.214 2019/10/18 04:33:53 ozaki-r 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.213 2019/10/16 07:41:28 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.214 2019/10/18 04:33:53 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_gateway.h"
@@ -1550,6 +1550,8 @@
 
        ip6_temp_preferred_lifetime = pltime;
 
+       in6_tmpaddrtimer_schedule();
+
        return 0;
 }