Module Name: src
Committed By: knakahara
Date: Thu Oct 3 03:10:02 UTC 2019
Modified Files:
src/sys/net: route.c
Log Message:
Revert route.c:r1.224 to fix net/arp/t_arp and net/ndp/t_ndp failure.
And refactor a little. Discussed with ozaki-r@n.o.
To generate a diff of this commit:
cvs rdiff -u -r1.224 -r1.225 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.224 src/sys/net/route.c:1.225
--- src/sys/net/route.c:1.224 Mon Sep 30 10:22:14 2019
+++ src/sys/net/route.c Thu Oct 3 03:10:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.224 2019/09/30 10:22:14 knakahara Exp $ */
+/* $NetBSD: route.c,v 1.225 2019/10/03 03:10:02 knakahara 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.224 2019/09/30 10:22:14 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.225 2019/10/03 03:10:02 knakahara Exp $");
#include <sys/param.h>
#ifdef RTFLUSH_DEBUG
@@ -1400,11 +1400,8 @@ rt_update_get_ifa(const struct rt_addrin
*ifp = ifa->ifa_ifp;
if_acquire(*ifp, psref_ifp);
if (info->rti_info[RTAX_IFA] == NULL &&
- info->rti_info[RTAX_GATEWAY] == NULL) {
- ifa_release(ifa, psref);
- ifa = NULL;
- goto next;
- }
+ info->rti_info[RTAX_GATEWAY] == NULL)
+ goto out;
ifa_release(ifa, psref);
if (info->rti_info[RTAX_IFA] == NULL) {
/* route change <dst> <gw> -ifp <if> */
