Module Name: src
Committed By: martin
Date: Mon Aug 27 07:49:11 UTC 2018
Modified Files:
src/sys/net [netbsd-8]: if.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #991):
sys/net/if.c: revision 1.434
Restore splx removed accidentally at v1.406
Pointed out by k-goda@IIJ
To generate a diff of this commit:
cvs rdiff -u -r1.394.2.13 -r1.394.2.14 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.394.2.13 src/sys/net/if.c:1.394.2.14
--- src/sys/net/if.c:1.394.2.13 Fri Jul 13 16:01:12 2018
+++ src/sys/net/if.c Mon Aug 27 07:49:11 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.394.2.13 2018/07/13 16:01:12 martin Exp $ */
+/* $NetBSD: if.c,v 1.394.2.14 2018/08/27 07:49:11 martin 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.394.2.13 2018/07/13 16:01:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.394.2.14 2018/08/27 07:49:11 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -2326,6 +2326,7 @@ if_link_state_change_softint(struct ifne
/* Ensure the change is still valid. */
if (ifp->if_link_state == link_state) {
IF_LINK_STATE_CHANGE_UNLOCK(ifp);
+ splx(s);
return;
}