[src/trunk]: src/sys do missing ipsec->kame_ipsec renames

[drochner <drochner%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/41a361ad63a1
branches:  trunk
changeset: 772125:41a361ad63a1
user:      drochner <drochner%NetBSD.org@localhost>
date:      Mon Dec 19 16:10:07 2011 +0000

description:
do missing ipsec->kame_ipsec renames

diffstat:

 sys/conf/files                       |   6 +++---
 sys/dist/ipf/netinet/ip_fil_netbsd.c |   6 +++---
 sys/dist/pf/net/if_pfsync.c          |  10 +++++-----
 sys/dist/pf/net/pf.c                 |  12 ++++++------
 4 files changed, 17 insertions(+), 17 deletions(-)

diffs (147 lines):

diff -r 4ff40743d1b2 -r 41a361ad63a1 sys/conf/files
--- a/sys/conf/files    Mon Dec 19 15:36:26 2011 +0000
+++ b/sys/conf/files    Mon Dec 19 16:10:07 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files,v 1.1033 2011/12/17 20:05:38 tls Exp $
+#      $NetBSD: files,v 1.1034 2011/12/19 16:10:07 drochner Exp $
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
 
 version        20100430
@@ -1676,7 +1676,7 @@
 file   net/rtbl.c
 file   net/rtsock.c
 file   net/slcompress.c                sl | ppp | strip | (irip & irip_vj)
-file   net/zlib.c                      (ppp & ppp_deflate) | ipsec | opencrypto | vnd_compression
+file   net/zlib.c                      (ppp & ppp_deflate) | kame_ipsec | opencrypto | vnd_compression
 file   netinet/accf_data.c             accf_data
 file   netinet/accf_http.c             accf_http
 file   netinet/cpu_in_cksum.c          (inet | inet6) & !cpu_in_cksum
@@ -1686,7 +1686,7 @@
 file   netinet/in_cksum.c              inet
 file   netinet/in_gif.c                gif & inet
 file   netinet/ip_carp.c               carp & (inet | inet6)   needs-flag
-file   netinet/ip_ecn.c                ipsec | fast_ipsec | gif | stf
+file   netinet/ip_ecn.c                kame_ipsec | fast_ipsec | gif | stf
 file   netinet/ip_encap.c              inet | inet6
 file   netinet/ip_etherip.c            etherip & inet
 file   netinet6/ip6_etherip.c          etherip & inet6
diff -r 4ff40743d1b2 -r 41a361ad63a1 sys/dist/ipf/netinet/ip_fil_netbsd.c
--- a/sys/dist/ipf/netinet/ip_fil_netbsd.c      Mon Dec 19 15:36:26 2011 +0000
+++ b/sys/dist/ipf/netinet/ip_fil_netbsd.c      Mon Dec 19 16:10:07 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_fil_netbsd.c,v 1.56 2010/09/05 12:36:46 mlelstv Exp $       */
+/*     $NetBSD: ip_fil_netbsd.c,v 1.57 2011/12/19 16:10:07 drochner Exp $      */
 
 /*
  * Copyright (C) 1993-2003 by Darren Reed.
@@ -8,7 +8,7 @@
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.56 2010/09/05 12:36:46 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.57 2011/12/19 16:10:07 drochner Exp $");
 #else
 static const char sccsid[] = "@(#)ip_fil.c     2.41 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: ip_fil_netbsd.c,v 2.55.2.67 2009/12/19 05:41:08 darrenr Exp";
@@ -986,7 +986,7 @@
        default :
                return EINVAL;
        }
-#ifdef IPSEC
+#ifdef KAME_IPSEC
        m->m_pkthdr.rcvif = NULL;
 #endif
 
diff -r 4ff40743d1b2 -r 41a361ad63a1 sys/dist/pf/net/if_pfsync.c
--- a/sys/dist/pf/net/if_pfsync.c       Mon Dec 19 15:36:26 2011 +0000
+++ b/sys/dist/pf/net/if_pfsync.c       Mon Dec 19 16:10:07 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_pfsync.c,v 1.7 2010/11/05 01:35:58 rmind Exp $      */
+/*     $NetBSD: if_pfsync.c,v 1.8 2011/12/19 16:10:07 drochner Exp $   */
 /*     $OpenBSD: if_pfsync.c,v 1.83 2007/06/26 14:44:12 mcbride Exp $  */
 
 /*
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pfsync.c,v 1.7 2010/11/05 01:35:58 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pfsync.c,v 1.8 2011/12/19 16:10:07 drochner Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -361,7 +361,7 @@
        struct pfsync_state_clr *cp;
        struct pfsync_state_upd_req *rup;
        struct pfsync_state_bus *bus;
-#ifdef IPSEC
+#ifdef KAME_IPSEC
        struct pfsync_tdb *pt;
 #endif
        struct in_addr src;
@@ -849,7 +849,7 @@
                        break;
                }
                break;
-#ifdef IPSEC
+#ifdef KAME_IPSEC
        case PFSYNC_ACT_TDB_UPD:
                if ((mp = m_pulldown(m, iplen + sizeof(*ph),
                    count * sizeof(*pt), &offp)) == NULL) {
@@ -1624,7 +1624,7 @@
        return (0);
 }
 
-#ifdef IPSEC
+#ifdef KAME_IPSEC
 /* Update an in-kernel tdb. Silently fail if no tdb is found. */
 void
 pfsync_update_net_tdb(struct pfsync_tdb *pt)
diff -r 4ff40743d1b2 -r 41a361ad63a1 sys/dist/pf/net/pf.c
--- a/sys/dist/pf/net/pf.c      Mon Dec 19 15:36:26 2011 +0000
+++ b/sys/dist/pf/net/pf.c      Mon Dec 19 16:10:07 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pf.c,v 1.67 2011/11/19 22:51:24 tls Exp $      */
+/*     $NetBSD: pf.c,v 1.68 2011/12/19 16:10:07 drochner Exp $ */
 /*     $OpenBSD: pf.c,v 1.552.2.1 2007/11/27 16:37:57 henning Exp $ */
 
 /*
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pf.c,v 1.67 2011/11/19 22:51:24 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pf.c,v 1.68 2011/12/19 16:10:07 drochner Exp $");
 
 #include "pflog.h"
 
@@ -5237,9 +5237,9 @@
        struct pf_addr           naddr;
        struct pf_src_node      *sn = NULL;
        int                      error = 0;
-#ifdef IPSEC
+#ifdef KAME_IPSEC
        struct m_tag            *mtag;
-#endif /* IPSEC */
+#endif /* KAME_IPSEC */
 #ifdef __NetBSD__
        struct pf_mtag          *pf_mtag;
 #endif /* __NetBSD__ */
@@ -5342,7 +5342,7 @@
        }
 
        /* Copied from ip_output. */
-#ifdef IPSEC
+#ifdef KAME_IPSEC
        /*
         * If deferred crypto processing is needed, check that the
         * interface supports it.
@@ -5353,7 +5353,7 @@
                ipsp_skipcrypto_unmark((struct tdb_ident *)(mtag + 1));
                goto bad;
        }
-#endif /* IPSEC */
+#endif /* KAME_IPSEC */
 
        /* Catch routing changes wrt. hardware checksumming for TCP or UDP. */
 #ifdef __NetBSD__