Module Name: src
Committed By: ozaki-r
Date: Mon Apr 25 14:30:42 UTC 2016
Modified Files:
src/sys/net: route.c
Log Message:
Don't rt_setkey twice
To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 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.162 src/sys/net/route.c:1.163
--- src/sys/net/route.c:1.162 Wed Apr 13 00:47:01 2016
+++ src/sys/net/route.c Mon Apr 25 14:30:42 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.162 2016/04/13 00:47:01 ozaki-r Exp $ */
+/* $NetBSD: route.c,v 1.163 2016/04/25 14:30:42 ozaki-r Exp $ */
/*-
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.162 2016/04/13 00:47:01 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.163 2016/04/25 14:30:42 ozaki-r Exp $");
#include <sys/param.h>
#ifdef RTFLUSH_DEBUG
@@ -808,22 +808,22 @@ rtrequest1(int req, struct rt_addrinfo *
memset(rt, 0, sizeof(*rt));
rt->rt_flags = RTF_UP | flags;
LIST_INIT(&rt->rt_timer);
- RT_DPRINTF("rt->_rt_key = %p\n", (void *)rt->_rt_key);
- if (rt_setkey(rt, dst, M_NOWAIT) == NULL ||
- rt_setgate(rt, gateway) != 0) {
- pool_put(&rtentry_pool, rt);
- senderr(ENOBUFS);
- }
+
RT_DPRINTF("rt->_rt_key = %p\n", (void *)rt->_rt_key);
if (netmask) {
rt_maskedcopy(dst, (struct sockaddr *)&maskeddst,
netmask);
rt_setkey(rt, (struct sockaddr *)&maskeddst, M_NOWAIT);
- RT_DPRINTF("rt->_rt_key = %p\n", (void *)rt->_rt_key);
} else {
rt_setkey(rt, dst, M_NOWAIT);
- RT_DPRINTF("rt->_rt_key = %p\n", (void *)rt->_rt_key);
}
+ RT_DPRINTF("rt->_rt_key = %p\n", (void *)rt->_rt_key);
+ if (rt_getkey(rt) == NULL ||
+ rt_setgate(rt, gateway) != 0) {
+ pool_put(&rtentry_pool, rt);
+ senderr(ENOBUFS);
+ }
+
rt_set_ifa(rt, ifa);
if (info->rti_info[RTAX_TAG] != NULL)
rt_settag(rt, info->rti_info[RTAX_TAG]);
