 @@ -1,14 +1,14 @@
-/*	$NetBSD: route.c,v 1.178 2016/10/21 10:52:47 ozaki-r Exp $	*/
+/*	$NetBSD: route.c,v 1.179 2016/10/21 10:56:35 ozaki-r Exp $	*/
 /*-
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Kevin M. Lahey of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -87,27 +87,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)route.c	8.3 (Berkeley) 1/9/95
  */
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_route.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.178 2016/10/21 10:52:47 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.179 2016/10/21 10:56:35 ozaki-r Exp $");
 #include <sys/param.h>
 #ifdef RTFLUSH_DEBUG
 #include <sys/sysctl.h>
 #endif
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
 @@ -463,27 +463,26 @@ rtfree(struct rtentry *rt)
 	struct ifaddr *ifa;
 	KASSERT(rt != NULL);
 	KASSERT(rt->rt_refcnt > 0);
 	rt->rt_refcnt--;
 #if defined(DEBUG) && !defined(NET_MPSAFE)
 	if (rt_getkey(rt) != NULL)
 		rtcache_check_rtrefcnt(rt_getkey(rt)->sa_family);
 #endif
 	if (rt->rt_refcnt == 0 && (rt->rt_flags & RTF_UP) == 0) {
 		rt_assert_inactive(rt);
 		rttrash--;
 		rt_timer_remove_all(rt);
 		ifa = rt->rt_ifa;
 		rt->rt_ifa = NULL;
 		ifafree(ifa);
 		rt->rt_ifp = NULL;
 		rt_destroy(rt);
 		pool_put(&rtentry_pool, rt);
+	}
+}
 /*
  * Force a routing table entry to the specified
  * destination to go through the given gateway.
  * Normally called as a result of a routing redirect
 @@ -843,26 +842,27 @@ rtrequest1(int req, struct rt_addrinfo *
 		if ((ifa = rt->rt_ifa)) {
 			if (ifa->ifa_flags & IFA_ROUTE &&
 			    rt_ifa_connected(rt, ifa)) {
 				RT_DPRINTF("rt->_rt_key = %p, ifa = %p, "
 				    "deleted IFA_ROUTE\n",
 				    (void *)rt->_rt_key, (void *)ifa);
 				ifa->ifa_flags &= ~IFA_ROUTE;
+			}
 			if (ifa->ifa_rtrequest)
 				ifa->ifa_rtrequest(RTM_DELETE, rt, info);
 			ifa = NULL;
+		}
 		rttrash++;
 		rt_timer_remove_all(rt);
 		if (ret_nrt) {
 			*ret_nrt = rt;
 			rt->rt_refcnt++;
 		} else if (rt->rt_refcnt <= 0) {
 			/* Adjust the refcount */
 			rt->rt_refcnt++;
 			rtfree(rt);
+		}
 		rtcache_clear_rtentry(dst->sa_family, rt);
 		break;
 	case RTM_ADD:
 		if (info->rti_ifa == NULL) {
 @@ -1326,28 +1326,28 @@ rt_timer_count(struct rttimer_queue *rtq
 static void
 rt_timer_remove_all(struct rtentry *rt)
+{
 	struct rttimer *r;
 	while ((r = LIST_FIRST(&rt->rt_timer)) != NULL) {
 		LIST_REMOVE(r, rtt_link);
 		TAILQ_REMOVE(&r->rtt_queue->rtq_head, r, rtt_next);
 		if (r->rtt_queue->rtq_count > 0)
 			r->rtt_queue->rtq_count--;
 		else
 			printf("rt_timer_remove_all: rtq_count reached 0\n");
 		rtfree(r->rtt_rt);
 		pool_put(&rttimer_pool, r);
 		rt->rt_refcnt--; /* XXX */
+	}
+}
 int
 rt_timer_add(struct rtentry *rt,
 	void (*func)(struct rtentry *, struct rttimer *),
 	struct rttimer_queue *queue)
+{
 	struct rttimer *r;
 	KASSERT(func != NULL);
 	/*
 	 * If there's already a timer with this action, destroy it before