CVS commit: src/sys

[Maxime Villard]

Module Name:    src
Committed By:   maxv
Date:           Sat Apr 28 14:21:04 UTC 2018

Modified Files:
        src/sys/netipsec: ipsec.c ipsec.h
        src/sys/rump/librump/rumpnet: net_stub.c

Log Message:
Stop using a macro, rename the function to ipsec_init_pcbpolicy directly.


To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 src/sys/netipsec/ipsec.c
cvs rdiff -u -r1.75 -r1.76 src/sys/netipsec/ipsec.h
cvs rdiff -u -r1.32 -r1.33 src/sys/rump/librump/rumpnet/net_stub.c

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/ipsec.c
diff -u src/sys/netipsec/ipsec.c:1.158 src/sys/netipsec/ipsec.c:1.159
--- src/sys/netipsec/ipsec.c:1.158	Sat Apr 28 14:01:50 2018
+++ src/sys/netipsec/ipsec.c	Sat Apr 28 14:21:03 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.c,v 1.158 2018/04/28 14:01:50 maxv Exp $ */
+/* $NetBSD: ipsec.c,v 1.159 2018/04/28 14:21:03 maxv Exp $ */
 /* $FreeBSD: ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $ */
 /* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
 
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.158 2018/04/28 14:01:50 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.159 2018/04/28 14:21:03 maxv Exp $");
 
 /*
  * IPsec controller part.
@@ -1104,9 +1104,8 @@ ipsec_delpcbpolicy(struct inpcbpolicy *p
 	kmem_intr_free(p, sizeof(*p));
 }
 
-/* initialize policy in PCB */
 int
-ipsec_init_policy(struct socket *so, struct inpcbpolicy **policy)
+ipsec_init_pcbpolicy(struct socket *so, struct inpcbpolicy **policy)
 {
 	struct inpcbpolicy *new;
 

Index: src/sys/netipsec/ipsec.h
diff -u src/sys/netipsec/ipsec.h:1.75 src/sys/netipsec/ipsec.h:1.76
--- src/sys/netipsec/ipsec.h:1.75	Sat Apr 28 14:01:50 2018
+++ src/sys/netipsec/ipsec.h	Sat Apr 28 14:21:03 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipsec.h,v 1.75 2018/04/28 14:01:50 maxv Exp $	*/
+/*	$NetBSD: ipsec.h,v 1.76 2018/04/28 14:21:03 maxv Exp $	*/
 /*	$FreeBSD: ipsec.h,v 1.2.4.2 2004/02/14 22:23:23 bms Exp $	*/
 /*	$KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 itojun Exp $	*/
 
@@ -269,8 +269,7 @@ int ipsec6_input(struct mbuf *);
 #endif
 
 struct inpcb;
-#define	ipsec_init_pcbpolicy ipsec_init_policy
-int ipsec_init_policy(struct socket *so, struct inpcbpolicy **);
+int ipsec_init_pcbpolicy(struct socket *so, struct inpcbpolicy **);
 int ipsec_copy_policy(const struct inpcbpolicy *, struct inpcbpolicy *);
 u_int ipsec_get_reqlevel(const struct ipsecrequest *);
 

Index: src/sys/rump/librump/rumpnet/net_stub.c
diff -u src/sys/rump/librump/rumpnet/net_stub.c:1.32 src/sys/rump/librump/rumpnet/net_stub.c:1.33
--- src/sys/rump/librump/rumpnet/net_stub.c:1.32	Thu Apr 12 21:38:59 2018
+++ src/sys/rump/librump/rumpnet/net_stub.c	Sat Apr 28 14:21:03 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: net_stub.c,v 1.32 2018/04/12 21:38:59 christos Exp $	*/
+/*	$NetBSD: net_stub.c,v 1.33 2018/04/28 14:21:03 maxv Exp $	*/
 
 /*
  * Copyright (c) 2008 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: net_stub.c,v 1.32 2018/04/12 21:38:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: net_stub.c,v 1.33 2018/04/28 14:21:03 maxv Exp $");
 
 #include <sys/mutex.h>
 #include <sys/param.h>
@@ -100,7 +100,7 @@ __weak_alias(ipsec_get_policy,rumpnet_st
 __weak_alias(ipsec_delete_pcbpolicy,rumpnet_stub);
 __weak_alias(ipsec_hdrsiz,rumpnet_stub);
 __weak_alias(ipsec_in_reject,rumpnet_stub);
-__weak_alias(ipsec_init_policy,rumpnet_stub);
+__weak_alias(ipsec_init_pcbpolicy,rumpnet_stub);
 __weak_alias(ipsec_pcbconn,rumpnet_stub);
 __weak_alias(ipsec_pcbdisconn,rumpnet_stub);
 __weak_alias(key_sa_routechange,rumpnet_stub);