diff options
| author |   bluhm <bluhm@openbsd.org> | 2016-12-27 18:45:01 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2016-12-27 18:45:01 +0000 |
| commit | d5be4bb8b99aaa85c71a55a9aba9b4dae08f8bc3 (patch) | |
| tree | 4e2d1f38de58bf802bfe0683d57ac9527194bccb /sys/netinet6/ip6_input.c | |
| parent | Replace struct rroute with struct kroute, as done in ospfd (diff) | |
| download | wireguard-openbsd-d5be4bb8b99aaa85c71a55a9aba9b4dae08f8bc3.tar.xz wireguard-openbsd-d5be4bb8b99aaa85c71a55a9aba9b4dae08f8bc3.zip | |
Move nd6 timer initialisation to nd6_init() and call timeout_set()
only once during init.
OK mpi@
Diffstat (limited to 'sys/netinet6/ip6_input.c')
| -rw-r--r-- | sys/netinet6/ip6_input.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 4b57e07f6ad..f52ad6f2095 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_input.c,v 1.173 2016/12/26 21:30:10 jca Exp $ */ +/* $OpenBSD: ip6_input.c,v 1.174 2016/12/27 18:45:01 bluhm Exp $ */ /* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */ /* @@ -119,7 +119,6 @@ struct niqueue ip6intrq = NIQUEUE_INITIALIZER(IFQ_MAXLEN, NETISR_IPV6); struct ip6stat ip6stat; -void ip6_init2(void *); int ip6_check_rh0hdr(struct mbuf *, int *); int ip6_hbhchcheck(struct mbuf *, int *, int *, int *); @@ -157,21 +156,10 @@ ip6_init(void) ip6_randomid_init(); nd6_init(); frag6_init(); - ip6_init2(NULL); mq_init(&ip6send_mq, 64, IPL_SOFTNET); } -void -ip6_init2(void *dummy) -{ - - /* nd6_timer_init */ - bzero(&nd6_timer_ch, sizeof(nd6_timer_ch)); - timeout_set(&nd6_timer_ch, nd6_timer, NULL); - timeout_add_sec(&nd6_timer_ch, 1); -} - /* * IP6 input interrupt handling. Just pass the packet to ip6_input. */ |