Module Name: src
Committed By: pgoyette
Date: Fri May 3 02:10:58 UTC 2019
Modified Files:
src/sys/net: rtsock_shared.c
Log Message:
Only initialize the NET_MPSAFE stuff once, for the non-compat version
of route_init().
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/net/rtsock_shared.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/rtsock_shared.c
diff -u src/sys/net/rtsock_shared.c:1.8 src/sys/net/rtsock_shared.c:1.9
--- src/sys/net/rtsock_shared.c:1.8 Mon Apr 29 16:12:30 2019
+++ src/sys/net/rtsock_shared.c Fri May 3 02:10:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock_shared.c,v 1.8 2019/04/29 16:12:30 roy Exp $ */
+/* $NetBSD: rtsock_shared.c,v 1.9 2019/05/03 02:10:58 pgoyette Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsock_shared.c,v 1.8 2019/04/29 16:12:30 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_shared.c,v 1.9 2019/05/03 02:10:58 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1634,14 +1634,12 @@ COMPATNAME(route_init)(void)
#ifndef COMPAT_RTSOCK
rt_init();
-#endif
#ifdef NET_MPSAFE
rt_so_mtx = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NONE);
cv_init(&rt_update_cv, "rtsock_cv");
#endif
-#ifndef COMPAT_RTSOCK
sysctl_net_route_setup(NULL, PF_ROUTE, "rtable");
#endif
ri->ri_intrq.ifq_maxlen = ri->ri_maxqlen;