CVS commit: src/sys/netipsec

[Ryota Ozaki]

Module Name:    src
Committed By:   ozaki-r
Date:           Fri May 26 08:09:44 UTC 2017

Modified Files:
        src/sys/netipsec: key.c key.h

Log Message:
Comment out unused key_freesp_so and key_freeso


To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 src/sys/netipsec/key.c
cvs rdiff -u -r1.16 -r1.17 src/sys/netipsec/key.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.142 src/sys/netipsec/key.c:1.143
--- src/sys/netipsec/key.c:1.142	Fri May 26 08:00:15 2017
+++ src/sys/netipsec/key.c	Fri May 26 08:09:44 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: key.c,v 1.142 2017/05/26 08:00:15 ozaki-r Exp $	*/
+/*	$NetBSD: key.c,v 1.143 2017/05/26 08:09:44 ozaki-r Exp $	*/
 /*	$FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $	*/
 /*	$KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $	*/
 
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.142 2017/05/26 08:00:15 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.143 2017/05/26 08:09:44 ozaki-r Exp $");
 
 /*
  * This code is referd to RFC 2367
@@ -374,7 +374,10 @@ struct sadb_msghdr {
 };
 
 static struct secasvar *key_allocsa_policy (const struct secasindex *);
-static void key_freesp_so (struct secpolicy **);
+#if 0
+static void key_freeso(struct socket *);
+static void key_freesp_so(struct secpolicy **);
+#endif
 static struct secasvar *key_do_allocsa_policy (struct secashead *, u_int);
 static void key_delsp (struct secpolicy *);
 static struct secpolicy *key_getsp (const struct secpolicyindex *);
@@ -1250,11 +1253,12 @@ _key_freesp(struct secpolicy **spp, cons
 	}
 }
 
+#if 0
 /*
  * Must be called after calling key_allocsp().
  * For the packet with socket.
  */
-void
+static void
 key_freeso(struct socket *so)
 {
 	/* sanity check */
@@ -1322,6 +1326,7 @@ key_freesp_so(struct secpolicy **sp)
 	    "invalid policy %u", (*sp)->policy);
 	KEY_FREESP(sp);
 }
+#endif
 
 /*
  * Must be called after calling key_allocsa().

Index: src/sys/netipsec/key.h
diff -u src/sys/netipsec/key.h:1.16 src/sys/netipsec/key.h:1.17
--- src/sys/netipsec/key.h:1.16	Tue May 16 02:59:22 2017
+++ src/sys/netipsec/key.h	Fri May 26 08:09:44 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: key.h,v 1.16 2017/05/16 02:59:22 ozaki-r Exp $	*/
+/*	$NetBSD: key.h,v 1.17 2017/05/26 08:09:44 ozaki-r Exp $	*/
 /*	$FreeBSD: src/sys/netipsec/key.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $	*/
 /*	$KAME: key.h,v 1.21 2001/07/27 03:51:30 itojun Exp $	*/
 
@@ -86,7 +86,6 @@ void key_freesav(struct secasvar **, con
 #define	KEY_FREESAV(psav)					\
 	key_freesav(psav, __func__, __LINE__)
 
-void key_freeso (struct socket *);
 int key_checktunnelsanity (struct secasvar *, u_int, void *, void *);
 int key_checkrequest (struct ipsecrequest *isr, const struct secasindex *);