summaryrefslogtreecommitdiffstats
path: root/sys/netinet6
diff options
context:
space:
mode:
Diffstat (limited to 'sys/netinet6')
-rw-r--r--sys/netinet6/ah.h4
-rw-r--r--sys/netinet6/ah6.h4
-rw-r--r--sys/netinet6/esp.h4
-rw-r--r--sys/netinet6/esp6.h4
-rw-r--r--sys/netinet6/in6_pcb.h4
-rw-r--r--sys/netinet6/ip6_ecn.h2
-rw-r--r--sys/netinet6/ipsec.h12
-rw-r--r--sys/netinet6/ipsec6.h4
-rw-r--r--sys/netinet6/pim6_var.h4
-rw-r--r--sys/netinet6/tcp6_var.h4
-rw-r--r--sys/netinet6/udp6_var.h4
11 files changed, 25 insertions, 25 deletions
diff --git a/sys/netinet6/ah.h b/sys/netinet6/ah.h
index 2786272..06137dd 100644
--- a/sys/netinet6/ah.h
+++ b/sys/netinet6/ah.h
@@ -72,7 +72,7 @@ struct ah_algorithm {
#define AH_MAXSUMSIZE 16
-#ifdef KERNEL
+#ifdef _KERNEL
extern struct ah_algorithm ah_algorithms[];
/* cksum routines */
@@ -83,6 +83,6 @@ extern void ah4_input __P((struct mbuf *, int, int));
extern int ah4_output __P((struct mbuf *, struct ipsecrequest *));
extern int ah4_calccksum __P((struct mbuf *, caddr_t,
struct ah_algorithm *, struct secasvar *));
-#endif /*KERNEL*/
+#endif
#endif /*_NETINET6_AH_H_*/
diff --git a/sys/netinet6/ah6.h b/sys/netinet6/ah6.h
index 9ae83a9..b3448f4 100644
--- a/sys/netinet6/ah6.h
+++ b/sys/netinet6/ah6.h
@@ -36,7 +36,7 @@
#ifndef _NETINET6_AH6_H_
#define _NETINET6_AH6_H_
-#ifdef KERNEL
+#ifdef _KERNEL
struct secasvar;
extern int ah6_input __P((struct mbuf **, int *, int));
@@ -44,6 +44,6 @@ extern int ah6_output __P((struct mbuf *, u_char *, struct mbuf *,
struct ipsecrequest *));
extern int ah6_calccksum __P((struct mbuf *, caddr_t,
struct ah_algorithm *, struct secasvar *));
-#endif /*KERNEL*/
+#endif
#endif /*_NETINET6_AH6_H_*/
diff --git a/sys/netinet6/esp.h b/sys/netinet6/esp.h
index 595aff1..b2f62cf 100644
--- a/sys/netinet6/esp.h
+++ b/sys/netinet6/esp.h
@@ -84,14 +84,14 @@ struct esp_algorithm {
struct secasvar *, struct esp_algorithm *, int));
};
-#ifdef KERNEL
+#ifdef _KERNEL
extern struct esp_algorithm esp_algorithms[];
/* crypt routines */
extern int esp4_output __P((struct mbuf *, struct ipsecrequest *));
extern void esp4_input __P((struct mbuf *, int, int));
extern size_t esp_hdrsiz __P((struct ipsecrequest *));
-#endif /*KERNEL*/
+#endif
extern int esp_auth __P((struct mbuf *, size_t, size_t,
struct secasvar *, u_char *));
diff --git a/sys/netinet6/esp6.h b/sys/netinet6/esp6.h
index e206376..0e3ba9b 100644
--- a/sys/netinet6/esp6.h
+++ b/sys/netinet6/esp6.h
@@ -36,10 +36,10 @@
#ifndef _NETINET6_ESP6_H_
#define _NETINET6_ESP6_H_
-#ifdef KERNEL
+#ifdef _KERNEL
extern int esp6_output __P((struct mbuf *, u_char *, struct mbuf *,
struct ipsecrequest *));
extern int esp6_input __P((struct mbuf **, int *, int));
-#endif /*KERNEL*/
+#endif
#endif /*_NETINET6_ESP6_H_*/
diff --git a/sys/netinet6/in6_pcb.h b/sys/netinet6/in6_pcb.h
index d962b21..6c59574 100644
--- a/sys/netinet6/in6_pcb.h
+++ b/sys/netinet6/in6_pcb.h
@@ -67,7 +67,7 @@
#ifndef _NETINET6_IN6_PCB_H_
#define _NETINET6_IN6_PCB_H_
-#ifdef KERNEL
+#ifdef _KERNEL
#define satosin6(sa) ((struct sockaddr_in6 *)(sa))
#define sin6tosa(sin6) ((struct sockaddr *)(sin6))
#define ifatoia6(ifa) ((struct in6_ifaddr *)(ifa))
@@ -103,6 +103,6 @@ struct in6_addr *in6_selectsrc __P((struct sockaddr_in6 *,
int in6_selecthlim __P((struct inpcb *, struct ifnet *));
void init_sin6 __P((struct sockaddr_in6 *sin6, struct mbuf *m));
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* !_NETINET6_IN6_PCB_H_ */
diff --git a/sys/netinet6/ip6_ecn.h b/sys/netinet6/ip6_ecn.h
index cafe9a5..ede21bc 100644
--- a/sys/netinet6/ip6_ecn.h
+++ b/sys/netinet6/ip6_ecn.h
@@ -34,7 +34,7 @@
* http://www.aciri.org/floyd/papers/draft-ipsec-ecn-00.txt
*/
-#if defined(KERNEL) || defined(_KERNEL)
+#ifdef _KERNEL
extern void ip6_ecn_ingress __P((int, u_int32_t *, u_int32_t *));
extern void ip6_ecn_egress __P((int, u_int32_t *, u_int32_t *));
#endif
diff --git a/sys/netinet6/ipsec.h b/sys/netinet6/ipsec.h
index ede791b..bd3bf54 100644
--- a/sys/netinet6/ipsec.h
+++ b/sys/netinet6/ipsec.h
@@ -39,7 +39,7 @@
#include <net/pfkeyv2.h>
#include <netkey/keydb.h>
-#ifdef KERNEL
+#ifdef _KERNEL
/*
* Security Policy Index
@@ -91,7 +91,7 @@ struct inpcbpolicy {
struct secpolicy *sp_out;
int priv; /* privileged socket ? */
};
-#endif /*KERNEL*/
+#endif /*_KERNEL*/
#define IPSEC_PORT_ANY 65535
#define IPSEC_ULPROTO_ANY 255
@@ -237,7 +237,7 @@ struct ipsecstat {
&ip6_ipsec_ecn, \
}
-#ifdef KERNEL
+#ifdef _KERNEL
#ifdef SYSCTL_DECL
SYSCTL_DECL(_net_inet_ipsec);
@@ -305,16 +305,16 @@ extern int ipsec4_tunnel_validate __P((struct ip *, u_int,
extern struct mbuf *ipsec_copypkt __P((struct mbuf *));
-#endif /*KERNEL*/
+#endif /*_KERNEL*/
-#ifndef KERNEL
+#ifndef _KERNEL
extern caddr_t ipsec_set_policy __P((char *policy, int buflen));
extern int ipsec_get_policylen __P((caddr_t buf));
extern char *ipsec_dump_policy __P((caddr_t buf, char *delimiter));
extern char *ipsec_strerror __P((void));
-#endif /*!KERNEL*/
+#endif /*!_KERNEL*/
#endif /*_NETINET6_IPSEC_H_*/
diff --git a/sys/netinet6/ipsec6.h b/sys/netinet6/ipsec6.h
index c4e9924..0572592 100644
--- a/sys/netinet6/ipsec6.h
+++ b/sys/netinet6/ipsec6.h
@@ -36,7 +36,7 @@
#ifndef _NETINET6_IPSEC6_H_
#define _NETINET6_IPSEC6_H_
-#ifdef KERNEL
+#ifdef _KERNEL
#ifdef SYSCTL_DECL
SYSCTL_DECL(_net_inet6_ipsec6);
@@ -77,5 +77,5 @@ extern int ipsec6_output_tunnel __P((struct ipsec_output_state *,
extern int ipsec6_tunnel_validate __P((struct ip6_hdr *, u_int,
struct secasvar *));
-#endif /*KERNEL*/
+#endif /*_KERNEL*/
#endif /* _NETINET6_IPSEC6_H_ */
diff --git a/sys/netinet6/pim6_var.h b/sys/netinet6/pim6_var.h
index 3610a40..9423b7f 100644
--- a/sys/netinet6/pim6_var.h
+++ b/sys/netinet6/pim6_var.h
@@ -51,11 +51,11 @@ struct pim6stat {
u_int pim6s_snd_registers; /* sent registers */
};
-#if (defined(KERNEL)) || (defined(_KERNEL))
+#ifdef _KERNEL
extern struct pim6stat pim6stat;
int pim6_input __P((struct mbuf **, int*, int));
-#endif /* KERNEL */
+#endif
/*
* Names for PIM sysctl objects
diff --git a/sys/netinet6/tcp6_var.h b/sys/netinet6/tcp6_var.h
index 93f41d9..b2665c1 100644
--- a/sys/netinet6/tcp6_var.h
+++ b/sys/netinet6/tcp6_var.h
@@ -68,7 +68,7 @@
#ifndef _NETINET_TCP6_VAR_H_
#define _NETINET_TCP6_VAR_H_
-#ifdef KERNEL
+#ifdef _KERNEL
struct ip6_hdr;
void tcp6_ctlinput __P((int, struct sockaddr *, void *));
@@ -78,6 +78,6 @@ struct rtentry *tcp_rtlookup6 __P((struct inpcb *));
extern struct pr_usrreqs tcp6_usrreqs;
-#endif /* KERNEL */
+#endif
#endif /* _NETINET_TCP6_VAR_H_ */
diff --git a/sys/netinet6/udp6_var.h b/sys/netinet6/udp6_var.h
index e0ade7a..efadb7f 100644
--- a/sys/netinet6/udp6_var.h
+++ b/sys/netinet6/udp6_var.h
@@ -67,7 +67,7 @@
#ifndef _NETINET6_UDP6_VAR_H_
#define _NETINET6_UDP6_VAR_H_
-#ifdef KERNEL
+#ifdef _KERNEL
SYSCTL_DECL(_net_inet6_udp6);
extern struct pr_usrreqs udp6_usrreqs;
@@ -77,6 +77,6 @@ int udp6_input __P((struct mbuf **, int *, int));
int udp6_output __P((struct inpcb *inp, struct mbuf *m,
struct sockaddr *addr, struct mbuf *control,
struct proc *p));
-#endif /* KERNEL */
+#endif
#endif /*_NETINET6_UDP6_VAR_H_*/
OpenPOWER on IntegriCloud