Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-8]: src/sys/net Pull up following revision(s) (requested by ozaki...
details: https://anonhg.NetBSD.org/src/rev/a6047c4a9f5d
branches: netbsd-8
changeset: 435218:a6047c4a9f5d
user: martin <martin%NetBSD.org@localhost>
date: Mon Aug 27 07:49:11 2018 +0000
description:
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
diffstat:
sys/net/if.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diffs (26 lines):
diff -r 0a5dd5fc212b -r a6047c4a9f5d sys/net/if.c
--- a/sys/net/if.c Sun Aug 26 08:06:10 2018 +0000
+++ b/sys/net/if.c Mon Aug 27 07:49:11 2018 +0000
@@ -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 @@
/* Ensure the change is still valid. */
if (ifp->if_link_state == link_state) {
IF_LINK_STATE_CHANGE_UNLOCK(ifp);
+ splx(s);
return;
}
Home |
Main Index |
Thread Index |
Old Index