Module Name: src
Committed By: ozaki-r
Date: Tue Oct 25 02:45:10 UTC 2016
Modified Files:
src/sys/net: route.c route.h
src/sys/netinet: ip_icmp.c
src/sys/netinet6: icmp6.c
Log Message:
Remove unnecessary argument
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.181 src/sys/net/route.c
cvs rdiff -u -r1.105 -r1.106 src/sys/net/route.h
cvs rdiff -u -r1.152 -r1.153 src/sys/netinet/ip_icmp.c
cvs rdiff -u -r1.198 -r1.199 src/sys/netinet6/icmp6.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/net/route.c
diff -u src/sys/net/route.c:1.180 src/sys/net/route.c:1.181
--- src/sys/net/route.c:1.180 Mon Oct 24 03:19:07 2016
+++ src/sys/net/route.c Tue Oct 25 02:45:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.180 2016/10/24 03:19:07 ozaki-r Exp $ */
+/* $NetBSD: route.c,v 1.181 2016/10/25 02:45:09 ozaki-r Exp $ */
/*-
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.180 2016/10/24 03:19:07 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.181 2016/10/25 02:45:09 ozaki-r Exp $");
#include <sys/param.h>
#ifdef RTFLUSH_DEBUG
@@ -142,7 +142,7 @@ static struct workqueue *rt_timer_wq;
static struct work rt_timer_wk;
static void rt_timer_init(void);
-static void rt_timer_queue_remove_all(struct rttimer_queue *, int);
+static void rt_timer_queue_remove_all(struct rttimer_queue *);
static void rt_timer_remove_all(struct rtentry *);
static void rt_timer_timer(void *);
@@ -1289,15 +1289,14 @@ rt_timer_queue_change(struct rttimer_que
}
static void
-rt_timer_queue_remove_all(struct rttimer_queue *rtq, int destroy)
+rt_timer_queue_remove_all(struct rttimer_queue *rtq)
{
struct rttimer *r;
while ((r = TAILQ_FIRST(&rtq->rtq_head)) != NULL) {
LIST_REMOVE(r, rtt_link);
TAILQ_REMOVE(&rtq->rtq_head, r, rtt_next);
- if (destroy)
- (*r->rtt_func)(r->rtt_rt, r);
+ (*r->rtt_func)(r->rtt_rt, r);
rtfree(r->rtt_rt);
pool_put(&rttimer_pool, r);
if (rtq->rtq_count > 0)
@@ -1309,10 +1308,10 @@ rt_timer_queue_remove_all(struct rttimer
}
void
-rt_timer_queue_destroy(struct rttimer_queue *rtq, int destroy)
+rt_timer_queue_destroy(struct rttimer_queue *rtq)
{
- rt_timer_queue_remove_all(rtq, destroy);
+ rt_timer_queue_remove_all(rtq);
LIST_REMOVE(rtq, rtq_link);
Index: src/sys/net/route.h
diff -u src/sys/net/route.h:1.105 src/sys/net/route.h:1.106
--- src/sys/net/route.h:1.105 Fri Oct 21 09:01:44 2016
+++ src/sys/net/route.h Tue Oct 25 02:45:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: route.h,v 1.105 2016/10/21 09:01:44 ozaki-r Exp $ */
+/* $NetBSD: route.h,v 1.106 2016/10/25 02:45:09 ozaki-r Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -374,7 +374,7 @@ unsigned long
void rt_timer_queue_change(struct rttimer_queue *, long);
struct rttimer_queue *
rt_timer_queue_create(u_int);
-void rt_timer_queue_destroy(struct rttimer_queue *, int);
+void rt_timer_queue_destroy(struct rttimer_queue *);
void rt_newmsg(const int, const struct rtentry *);
struct rtentry *
Index: src/sys/netinet/ip_icmp.c
diff -u src/sys/netinet/ip_icmp.c:1.152 src/sys/netinet/ip_icmp.c:1.153
--- src/sys/netinet/ip_icmp.c:1.152 Wed Oct 19 01:10:15 2016
+++ src/sys/netinet/ip_icmp.c Tue Oct 25 02:45:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_icmp.c,v 1.152 2016/10/19 01:10:15 ozaki-r Exp $ */
+/* $NetBSD: ip_icmp.c,v 1.153 2016/10/25 02:45:09 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -94,7 +94,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.152 2016/10/19 01:10:15 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.153 2016/10/25 02:45:09 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -1018,8 +1018,7 @@ sysctl_net_inet_icmp_redirtimeout(SYSCTL
*/
if (icmp_redirect_timeout_q != NULL) {
if (icmp_redirtimeout == 0) {
- rt_timer_queue_destroy(icmp_redirect_timeout_q,
- true);
+ rt_timer_queue_destroy(icmp_redirect_timeout_q);
icmp_redirect_timeout_q = NULL;
} else {
rt_timer_queue_change(icmp_redirect_timeout_q,
Index: src/sys/netinet6/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.198 src/sys/netinet6/icmp6.c:1.199
--- src/sys/netinet6/icmp6.c:1.198 Tue Oct 18 02:46:21 2016
+++ src/sys/netinet6/icmp6.c Tue Oct 25 02:45:10 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.198 2016/10/18 02:46:21 ozaki-r Exp $ */
+/* $NetBSD: icmp6.c,v 1.199 2016/10/25 02:45:10 ozaki-r Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.198 2016/10/18 02:46:21 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.199 2016/10/25 02:45:10 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2831,8 +2831,7 @@ sysctl_net_inet6_icmp6_redirtimeout(SYSC
if (icmp6_redirect_timeout_q != NULL) {
if (icmp6_redirtimeout == 0) {
- rt_timer_queue_destroy(icmp6_redirect_timeout_q,
- true);
+ rt_timer_queue_destroy(icmp6_redirect_timeout_q);
} else {
rt_timer_queue_change(icmp6_redirect_timeout_q,
icmp6_redirtimeout);
