From 529a8fb2ae48e430635c2ca30bbc1a7bbb7b087a Mon Sep 17 00:00:00 2001 From: bluhm Date: Wed, 2 Mar 2022 20:16:43 +0000 Subject: [PATCH] Merge two comments describing the locks into one. --- sys/netinet/ip_ipsp.h | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/sys/netinet/ip_ipsp.h b/sys/netinet/ip_ipsp.h index d4cdbd77f68..3b9c82691d5 100644 --- a/sys/netinet/ip_ipsp.h +++ b/sys/netinet/ip_ipsp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipsp.h,v 1.234 2022/01/04 06:32:39 yasuoka Exp $ */ +/* $OpenBSD: ip_ipsp.h,v 1.235 2022/03/02 20:16:43 bluhm Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr), @@ -42,10 +42,13 @@ /* * Locks used to protect struct members in this file: - * I Immutable after creation + * I immutable after creation + * a atomic operations + * N net lock * F ipsec_flows_mtx - * a atomic + * m tdb_mtx fields of struct tdb * p ipo_tdb_mtx link policy to TDB global mutex + * s tdb_sadb_mtx SA database global mutex */ /* IPSP global definitions. */ @@ -306,14 +309,6 @@ struct ipsec_policy { #define IPSP_IDENTITY_USERFQDN 3 #define IPSP_IDENTITY_ASN1_DN 4 -/* - * Locks used to protect struct members in this file: - * I immutable after creation - * N net lock - * m tdb_mtx - * p ipo_tdb_mtx link policy to TDB global mutex - * s tdb_sadb_mtx SA database global mutex - */ struct tdb { /* tunnel descriptor block */ /* * Each TDB is on three hash tables: one keyed on dst/spi/sproto, -- 2.20.1