 @@ -1,14 +1,14 @@
-/*	$NetBSD: rtsock.c,v 1.213 2017/06/01 02:45:14 chs Exp $	*/
+/*	$NetBSD: rtsock.c,v 1.214 2017/06/15 02:51:45 ozaki-r Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -51,27 +51,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)rtsock.c	8.7 (Berkeley) 10/12/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.213 2017/06/01 02:45:14 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.214 2017/06/15 02:51:45 ozaki-r Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_mpls.h"
 #include "opt_compat_netbsd.h"
 #include "opt_sctp.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/socket.h>
 @@ -526,32 +526,31 @@ route_get_sdl(const struct ifnet *ifp, c
 	KASSERT(a != NULL);
 	if (la != NULL) {
 		*flags = la->la_flags;
 		LLE_RUNLOCK(la);
+	}
+}
 static int
 route_output_report(struct rtentry *rt, struct rt_addrinfo *info,
     struct rt_xmsghdr *rtm, struct rt_xmsghdr **new_rtm)
+{
 	int len;
 	struct ifnet *ifp;
-	if ((rtm->rtm_addrs & (RTA_IFP | RTA_IFA)) == 0)
+	if (rtm->rtm_addrs & (RTA_IFP | RTA_IFA)) {
 	else if ((ifp = rt->rt_ifp) != NULL) {
 		const struct ifaddr *rtifa;
 		const struct ifnet *ifp = rt->rt_ifp;
 		info->rti_info[RTAX_IFP] = ifp->if_dl->ifa_addr;
 		/* rtifa used to be simply rt->rt_ifa.
 		 * If rt->rt_ifa != NULL, then
 		 * rt_get_ifa() != NULL.  So this
 		 * ought to still be safe. --dyoung
 		 */
 		rtifa = rt_get_ifa(rt);
 		info->rti_info[RTAX_IFA] = rtifa->ifa_addr;
 #ifdef RTSOCK_DEBUG
 		if (info->rti_info[RTAX_IFA]->sa_family == AF_INET) {
 			char ibuf[INET_ADDRSTRLEN];
 			char abuf[INET_ADDRSTRLEN];
 			printf("%s: copying out RTAX_IFA %s "
 @@ -559,29 +558,26 @@ route_output_report(struct rtentry *rt,
 			    "ifa_getifa %p ifa_seqno %p\n",
 			    __func__,
 			    RT_IN_PRINT(info, ibuf, RTAX_IFA),
 			    RT_IN_PRINT(info, abuf, RTAX_DST),
 			    (void *)rtifa->ifa_getifa,
 			    rtifa->ifa_seqno);
+		}
 #endif /* RTSOCK_DEBUG */
 		if (ifp->if_flags & IFF_POINTOPOINT)
 			info->rti_info[RTAX_BRD] = rtifa->ifa_dstaddr;
 		else
 			info->rti_info[RTAX_BRD] = NULL;
 		rtm->rtm_index = ifp->if_index;
 	} else {
 		info->rti_info[RTAX_IFP] = NULL;
 		info->rti_info[RTAX_IFA] = NULL;
+	}
 	(void)rt_msg2(rtm->rtm_type, info, NULL, NULL, &len);
 	if (len > rtm->rtm_msglen) {
 		struct rt_xmsghdr *old_rtm = rtm;
 		R_Malloc(*new_rtm, struct rt_xmsghdr *, len);
 		if (*new_rtm == NULL)
 			return ENOBUFS;
 		(void)memcpy(*new_rtm, old_rtm, old_rtm->rtm_msglen);
 		rtm = *new_rtm;
+	}
 	(void)rt_msg2(rtm->rtm_type, info, rtm, NULL, 0);
 	rtm->rtm_flags = rt->rt_flags;
 	rtm_setmetrics(rt, rtm);