[src/trunk]: src/sys/net Revert route.c:r1.224 to fix net/arp/t_arp and net/n...

[knakahara <knakahara%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/103da8ba21d6
branches:  trunk
changeset: 965816:103da8ba21d6
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Thu Oct 03 03:10:02 2019 +0000

description:
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.

diffstat:

 sys/net/route.c |  11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diffs (32 lines):

diff -r 45d9e9a921df -r 103da8ba21d6 sys/net/route.c
--- a/sys/net/route.c   Thu Oct 03 01:34:31 2019 +0000
+++ b/sys/net/route.c   Thu Oct 03 03:10:02 2019 +0000
@@ -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 @@
                *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> */