CVS commit: src/sys/netipsec

[Ryota Ozaki]

Module Name:    src
Committed By:   ozaki-r
Date:           Fri Jun  2 03:32:51 UTC 2017

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

Log Message:
Tweak header file inclusions


To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 src/sys/netipsec/key.c
cvs rdiff -u -r1.8 -r1.9 src/sys/netipsec/keysock.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.162 src/sys/netipsec/key.c:1.163
--- src/sys/netipsec/key.c:1.162	Fri Jun  2 01:22:50 2017
+++ src/sys/netipsec/key.c	Fri Jun  2 03:32:51 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: key.c,v 1.162 2017/06/02 01:22:50 ozaki-r Exp $	*/
+/*	$NetBSD: key.c,v 1.163 2017/06/02 03:32:51 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.162 2017/06/02 01:22:50 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.163 2017/06/02 03:32:51 ozaki-r Exp $");
 
 /*
  * This code is referd to RFC 2367
@@ -51,7 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: key.c,v 1.16
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/domain.h>
-#include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
@@ -70,7 +69,6 @@ __KERNEL_RCSID(0, "$NetBSD: key.c,v 1.16
 
 #include <net/if.h>
 #include <net/route.h>
-#include <net/raw_cb.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>

Index: src/sys/netipsec/keysock.h
diff -u src/sys/netipsec/keysock.h:1.8 src/sys/netipsec/keysock.h:1.9
--- src/sys/netipsec/keysock.h:1.8	Wed Jan 20 21:44:00 2016
+++ src/sys/netipsec/keysock.h	Fri Jun  2 03:32:51 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: keysock.h,v 1.8 2016/01/20 21:44:00 riastradh Exp $	*/
+/*	$NetBSD: keysock.h,v 1.9 2017/06/02 03:32:51 ozaki-r Exp $	*/
 /*	$FreeBSD: src/sys/netipsec/keysock.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $	*/
 /*	$KAME: keysock.h,v 1.8 2000/03/27 05:11:06 sumikawa Exp $	*/
 
@@ -64,6 +64,8 @@
 #define KEY_SENDUP_REGISTERED	2
 
 #ifdef _KERNEL
+#include <net/raw_cb.h>
+
 struct keycb {
 	struct rawcb kp_raw;	/* rawcb */
 	int kp_promisc;		/* promiscuous mode */