CVS commit: src/sys/netipsec

[Maxime Villard]

Module Name:    src
Committed By:   maxv
Date:           Tue May  1 08:13:37 UTC 2018

Modified Files:
        src/sys/netipsec: xform_esp.c xform_ipcomp.c

Log Message:
Remove double include, opencrypto/xform.h is already included in
netipsec/xform.h.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/netipsec/xform_esp.c
cvs rdiff -u -r1.63 -r1.64 src/sys/netipsec/xform_ipcomp.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/xform_esp.c
diff -u src/sys/netipsec/xform_esp.c:1.82 src/sys/netipsec/xform_esp.c:1.83
--- src/sys/netipsec/xform_esp.c:1.82	Sat Apr 28 15:45:16 2018
+++ src/sys/netipsec/xform_esp.c	Tue May  1 08:13:37 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: xform_esp.c,v 1.82 2018/04/28 15:45:16 maxv Exp $	*/
+/*	$NetBSD: xform_esp.c,v 1.83 2018/05/01 08:13:37 maxv Exp $	*/
 /*	$FreeBSD: xform_esp.c,v 1.2.2.1 2003/01/24 05:11:36 sam Exp $	*/
 /*	$OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */
 
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.82 2018/04/28 15:45:16 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.83 2018/05/01 08:13:37 maxv Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -83,7 +83,6 @@ __KERNEL_RCSID(0, "$NetBSD: xform_esp.c,
 #include <netipsec/key_debug.h>
 
 #include <opencrypto/cryptodev.h>
-#include <opencrypto/xform.h>
 
 percpu_t *espstat_percpu;
 

Index: src/sys/netipsec/xform_ipcomp.c
diff -u src/sys/netipsec/xform_ipcomp.c:1.63 src/sys/netipsec/xform_ipcomp.c:1.64
--- src/sys/netipsec/xform_ipcomp.c:1.63	Sat Apr 28 15:45:16 2018
+++ src/sys/netipsec/xform_ipcomp.c	Tue May  1 08:13:37 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: xform_ipcomp.c,v 1.63 2018/04/28 15:45:16 maxv Exp $	*/
+/*	$NetBSD: xform_ipcomp.c,v 1.64 2018/05/01 08:13:37 maxv Exp $	*/
 /*	$FreeBSD: xform_ipcomp.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $	*/
 /* $OpenBSD: ip_ipcomp.c,v 1.1 2001/07/05 12:08:52 jjbg Exp $ */
 
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.63 2018/04/28 15:45:16 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.64 2018/05/01 08:13:37 maxv Exp $");
 
 /* IP payload compression protocol (IPComp), see RFC 2393 */
 #if defined(_KERNEL_OPT)
@@ -70,7 +70,6 @@ __KERNEL_RCSID(0, "$NetBSD: xform_ipcomp
 
 #include <opencrypto/cryptodev.h>
 #include <opencrypto/deflate.h>
-#include <opencrypto/xform.h>
 
 percpu_t *ipcompstat_percpu;