Fri Apr 1 09:52:39 2016 UTC ()

Don't request returning rtentry if not use it


(ozaki-r)

diff -r1.156 -r1.157 src/sys/net/route.c

--- src/sys/net/route.c 2016/04/01 09:00:27	1.156
+++ src/sys/net/route.c 2016/04/01 09:52:39	1.157

 @@ -1,14 +1,14 @@
-/*	$NetBSD: route.c,v 1.156 2016/04/01 09:00:27 ozaki-r Exp $	*/
+/*	$NetBSD: route.c,v 1.157 2016/04/01 09:52:39 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
 @@ -86,27 +86,27 @@
  * 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.
+ *
  *	@(#)route.c	8.3 (Berkeley) 1/9/95
  */
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_route.h"
 #endif
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.156 2016/04/01 09:00:27 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.157 2016/04/01 09:52:39 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>
 @@ -558,44 +558,41 @@ out:
 	info.rti_info[RTAX_AUTHOR] = src;
 	rt_missmsg(RTM_REDIRECT, &info, flags, error);
+}
 /*
  * Delete a route and generate a message.
  * It doesn't free a passed rt.
  */
 static int
 rtdeletemsg(struct rtentry *rt)
+{
 	int error;
 	struct rt_addrinfo info;
 	struct rtentry *retrt;
 	/*
 	 * Request the new route so that the entry is not actually
 	 * deleted.  That will allow the information being reported to
 	 * be accurate (and consistent with route_output()).
 	 */
 	memset(&info, 0, sizeof(info));
 	info.rti_info[RTAX_DST] = rt_getkey(rt);
 	info.rti_info[RTAX_NETMASK] = rt_mask(rt);
 	info.rti_info[RTAX_GATEWAY] = rt->rt_gateway;
 	info.rti_flags = rt->rt_flags;
-	error = rtrequest1(RTM_DELETE, &info, &retrt);
+	error = rtrequest1(RTM_DELETE, &info, NULL);
 	rt_missmsg(RTM_DELETE, &info, info.rti_flags, error);
 	if (error == 0)
 		rtfree(retrt);
 	return error;
+}
 static int
 rtflushclone1(struct rtentry *rt, void *arg)
+{
 	struct rtentry *parent;
 	parent = (struct rtentry *)arg;
 	if ((rt->rt_flags & RTF_CLONED) != 0 && rt->rt_parent == parent)
 		rtdeletemsg(rt);
 	return 0;
+}