Module Name: src
Committed By: ozaki-r
Date: Fri Apr 1 09:00:27 UTC 2016
Modified Files:
src/sys/net: route.c
Log Message:
Remove unnecessary RTTIMER_CALLOUT macro
rttimer#rtt_func never be NULL.
To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/sys/net/route.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.155 src/sys/net/route.c:1.156
--- src/sys/net/route.c:1.155 Fri Apr 1 02:00:14 2016
+++ src/sys/net/route.c Fri Apr 1 09:00:27 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.155 2016/04/01 02:00:14 ozaki-r Exp $ */
+/* $NetBSD: route.c,v 1.156 2016/04/01 09:00:27 ozaki-r Exp $ */
/*-
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.155 2016/04/01 02:00:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.156 2016/04/01 09:00:27 ozaki-r Exp $");
#include <sys/param.h>
#ifdef RTFLUSH_DEBUG
@@ -1203,16 +1203,6 @@ rt_ifa_remlocal(struct ifaddr *ifa, stru
LIST_HEAD(, rttimer_queue) rttimer_queue_head;
static int rt_init_done = 0;
-#define RTTIMER_CALLOUT(r) do { \
- if (r->rtt_func != NULL) { \
- (*r->rtt_func)(r->rtt_rt, r); \
- } else { \
- rtrequest((int) RTM_DELETE, \
- rt_getkey(r->rtt_rt), \
- 0, 0, 0, 0); \
- } \
- } while (/*CONSTCOND*/0)
-
/*
* Some subtle order problems with domain initialization mean that
* we cannot count on this being run from rt_init before various
@@ -1267,7 +1257,7 @@ rt_timer_queue_remove_all(struct rttimer
LIST_REMOVE(r, rtt_link);
TAILQ_REMOVE(&rtq->rtq_head, r, rtt_next);
if (destroy)
- RTTIMER_CALLOUT(r);
+ (*r->rtt_func)(r->rtt_rt, r);
rtfree(r->rtt_rt);
/* we are already at splsoftnet */
pool_put(&rttimer_pool, r);
@@ -1307,7 +1297,7 @@ rt_timer_remove_all(struct rtentry *rt,
LIST_REMOVE(r, rtt_link);
TAILQ_REMOVE(&r->rtt_queue->rtq_head, r, rtt_next);
if (destroy)
- RTTIMER_CALLOUT(r);
+ (*r->rtt_func)(r->rtt_rt, r);
if (r->rtt_queue->rtq_count > 0)
r->rtt_queue->rtq_count--;
else
@@ -1326,6 +1316,7 @@ rt_timer_add(struct rtentry *rt,
struct rttimer *r;
int s;
+ KASSERT(func != NULL);
/*
* If there's already a timer with this action, destroy it before
* we add a new one.
@@ -1378,7 +1369,7 @@ rt_timer_timer(void *arg)
(r->rtt_time + rtq->rtq_timeout) < time_uptime) {
LIST_REMOVE(r, rtt_link);
TAILQ_REMOVE(&rtq->rtq_head, r, rtt_next);
- RTTIMER_CALLOUT(r);
+ (*r->rtt_func)(r->rtt_rt, r);
rtfree(r->rtt_rt);
pool_put(&rttimer_pool, r);
if (rtq->rtq_count > 0)
