diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-10-16 08:22:26 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-10-16 08:22:26 +0000 |
| commit | 953fade1239ddddd9e112d513bee0ab49319a407 (patch) | |
| tree | 8734f3986ae847770d0b718e126d7038cc9a05b6 /sys/net/if_enc.c | |
| parent | 5794709eb5f9f22e86feb590d86544f0bb48897e (diff) | |
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@
Diffstat (limited to 'sys/net/if_enc.c')
| -rw-r--r-- | sys/net/if_enc.c | 4 |
1 files changed, 3 insertions, 1 deletions
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 <reyk@vantronix.net> @@ -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) |