From 953fade1239ddddd9e112d513bee0ab49319a407 Mon Sep 17 00:00:00 2001 From: Martin Pieuchot Date: Mon, 16 Oct 2017 08:22:26 +0000 Subject: Last changes before running IPsec w/o KERNEL_LOCK(). Put more NET_ASSERT_LOCK() and document which globals it protects. Add a mutex for pfkeyv2 globals. Convert ipsp_delete_acquire() to timeout_set_proc(). Tested by Hrvoje Popovski, ok bluhm@ visa@ --- sys/net/if_enc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sys/net/if_enc.c') diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c index 35454fce639..499e8609519 100644 --- a/sys/net/if_enc.c +++ b/sys/net/if_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_enc.c,v 1.69 2017/08/11 21:24:19 mpi Exp $ */ +/* $OpenBSD: if_enc.c,v 1.70 2017/10/16 08:22:25 mpi Exp $ */ /* * Copyright (c) 2010 Reyk Floeter @@ -214,6 +214,8 @@ enc_getif(u_int id, u_int unit) { struct ifnet *ifp; + NET_ASSERT_LOCKED(); + /* Check if the caller wants to get a non-default enc interface */ if (unit > 0) { if (unit > enc_max_unit) -- cgit v1.2.3