Module Name: src Committed By: maxv Date: Thu Feb 8 20:57:41 UTC 2018
Modified Files: src/sys/netipsec: ipsec.c ipsec_input.c ipsec_mbuf.c ipsec_output.c key.c Log Message: Remove unused net_osdep.h include. To generate a diff of this commit: cvs rdiff -u -r1.124 -r1.125 src/sys/netipsec/ipsec.c cvs rdiff -u -r1.55 -r1.56 src/sys/netipsec/ipsec_input.c cvs rdiff -u -r1.17 -r1.18 src/sys/netipsec/ipsec_mbuf.c cvs rdiff -u -r1.65 -r1.66 src/sys/netipsec/ipsec_output.c cvs rdiff -u -r1.247 -r1.248 src/sys/netipsec/key.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.124 src/sys/netipsec/ipsec.c:1.125 --- src/sys/netipsec/ipsec.c:1.124 Tue Jan 23 02:17:32 2018 +++ src/sys/netipsec/ipsec.c Thu Feb 8 20:57:41 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: ipsec.c,v 1.124 2018/01/23 02:17:32 ozaki-r Exp $ */ +/* $NetBSD: ipsec.c,v 1.125 2018/02/08 20:57:41 maxv Exp $ */ /* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/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.124 2018/01/23 02:17:32 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.125 2018/02/08 20:57:41 maxv Exp $"); /* * IPsec controller part. @@ -103,8 +103,6 @@ __KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1. #include <netipsec/xform.h> -#include <net/net_osdep.h> - int ipsec_used = 0; int ipsec_enabled = 1; Index: src/sys/netipsec/ipsec_input.c diff -u src/sys/netipsec/ipsec_input.c:1.55 src/sys/netipsec/ipsec_input.c:1.56 --- src/sys/netipsec/ipsec_input.c:1.55 Wed Jan 24 14:28:13 2018 +++ src/sys/netipsec/ipsec_input.c Thu Feb 8 20:57:41 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: ipsec_input.c,v 1.55 2018/01/24 14:28:13 maxv Exp $ */ +/* $NetBSD: ipsec_input.c,v 1.56 2018/02/08 20:57:41 maxv Exp $ */ /* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec_input.c,v 1.2.4.2 2003/03/28 20:32:53 sam Exp $ */ /* $OpenBSD: ipsec_input.c,v 1.63 2003/02/20 18:35:43 deraadt Exp $ */ @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ipsec_input.c,v 1.55 2018/01/24 14:28:13 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ipsec_input.c,v 1.56 2018/02/08 20:57:41 maxv Exp $"); /* * IPsec input processing. @@ -98,8 +98,6 @@ __KERNEL_RCSID(0, "$NetBSD: ipsec_input. #include <netipsec/xform.h> #include <netinet6/ip6protosw.h> -#include <net/net_osdep.h> - #define IPSEC_ISTAT(p, x, y, z) \ do { \ switch (p) { \ Index: src/sys/netipsec/ipsec_mbuf.c diff -u src/sys/netipsec/ipsec_mbuf.c:1.17 src/sys/netipsec/ipsec_mbuf.c:1.18 --- src/sys/netipsec/ipsec_mbuf.c:1.17 Thu Feb 1 17:16:11 2018 +++ src/sys/netipsec/ipsec_mbuf.c Thu Feb 8 20:57:41 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: ipsec_mbuf.c,v 1.17 2018/02/01 17:16:11 maxv Exp $ */ +/* $NetBSD: ipsec_mbuf.c,v 1.18 2018/02/08 20:57:41 maxv Exp $ */ /*- * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting * All rights reserved. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ipsec_mbuf.c,v 1.17 2018/02/01 17:16:11 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ipsec_mbuf.c,v 1.18 2018/02/08 20:57:41 maxv Exp $"); /* * IPsec-specific mbuf routines. @@ -46,8 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: ipsec_mbuf.c #include <netipsec/ipsec_var.h> #include <netipsec/ipsec_private.h> -#include <net/net_osdep.h> - /* * Create a writable copy of the mbuf chain. While doing this * we compact the chain with a goal of producing a chain with Index: src/sys/netipsec/ipsec_output.c diff -u src/sys/netipsec/ipsec_output.c:1.65 src/sys/netipsec/ipsec_output.c:1.66 --- src/sys/netipsec/ipsec_output.c:1.65 Fri Nov 17 07:37:12 2017 +++ src/sys/netipsec/ipsec_output.c Thu Feb 8 20:57:41 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: ipsec_output.c,v 1.65 2017/11/17 07:37:12 ozaki-r Exp $ */ +/* $NetBSD: ipsec_output.c,v 1.66 2018/02/08 20:57:41 maxv Exp $ */ /*- * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ipsec_output.c,v 1.65 2017/11/17 07:37:12 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ipsec_output.c,v 1.66 2018/02/08 20:57:41 maxv Exp $"); /* * IPsec output processing. @@ -84,8 +84,6 @@ __KERNEL_RCSID(0, "$NetBSD: ipsec_output #include <netipsec/keydb.h> #include <netipsec/key_debug.h> -#include <net/net_osdep.h> /* ovbcopy() in ipsec6_encapsulate() */ - static percpu_t *ipsec_rtcache_percpu __cacheline_aligned; /* Index: src/sys/netipsec/key.c diff -u src/sys/netipsec/key.c:1.247 src/sys/netipsec/key.c:1.248 --- src/sys/netipsec/key.c:1.247 Wed Jan 10 10:56:30 2018 +++ src/sys/netipsec/key.c Thu Feb 8 20:57:41 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: key.c,v 1.247 2018/01/10 10:56:30 knakahara Exp $ */ +/* $NetBSD: key.c,v 1.248 2018/02/08 20:57:41 maxv 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.247 2018/01/10 10:56:30 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.248 2018/02/08 20:57:41 maxv Exp $"); /* * This code is referred to RFC 2367 @@ -112,9 +112,6 @@ __KERNEL_RCSID(0, "$NetBSD: key.c,v 1.24 #include <netipsec/xform.h> #include <netipsec/ipcomp.h> - -#include <net/net_osdep.h> - #define FULLMASK 0xff #define _BITS(bytes) ((bytes) << 3)