Module Name: src
Committed By: ozaki-r
Date: Tue Jan 24 07:58:58 UTC 2017
Modified Files:
src/sys/net: if.c
Log Message:
Restore splnet for if_slowtimo
if_slowtimo (== if_watchdog) still requires splnet for most drivers.
Pointed out by nonaka@
To generate a diff of this commit:
cvs rdiff -u -r1.373 -r1.374 src/sys/net/if.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/if.c
diff -u src/sys/net/if.c:1.373 src/sys/net/if.c:1.374
--- src/sys/net/if.c:1.373 Mon Jan 23 10:19:03 2017
+++ src/sys/net/if.c Tue Jan 24 07:58:58 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.373 2017/01/23 10:19:03 ozaki-r Exp $ */
+/* $NetBSD: if.c,v 1.374 2017/01/24 07:58:58 ozaki-r Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.373 2017/01/23 10:19:03 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.374 2017/01/24 07:58:58 ozaki-r Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -2450,7 +2450,7 @@ if_slowtimo(void *arg)
if (__predict_false(slowtimo == NULL))
return;
- s = splsoftnet();
+ s = splnet();
if (ifp->if_timer != 0 && --ifp->if_timer == 0)
(*slowtimo)(ifp);
