summaryrefslogtreecommitdiff
path: root/sys/netinet6/ip6_var.h
diff options
context:
space:
mode:
Diffstat (limited to 'sys/netinet6/ip6_var.h')
-rw-r--r--sys/netinet6/ip6_var.h32
1 files changed, 1 insertions, 31 deletions
diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h
index 6bacf3ccbda..dcac54dd1dc 100644
--- a/sys/netinet6/ip6_var.h
+++ b/sys/netinet6/ip6_var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_var.h,v 1.1 1999/12/08 06:50:21 itojun Exp $ */
+/* $OpenBSD: ip6_var.h,v 1.2 1999/12/10 10:04:28 angelos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -210,23 +210,10 @@ extern int ip6_dad_count; /* DupAddrDetectionTransmits */
extern u_int32_t ip6_flow_seq;
extern int ip6_auto_flowlabel;
-#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3)
struct in6pcb;
-#endif
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
-extern struct pr_usrreqs rip6_usrreqs;
-struct sockopt;
-#endif
-
-#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(__OpenBSD__) || (defined(__bsdi__) && _BSDI_VERSION >= 199802)
struct inpcb;
-#endif
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
-int icmp6_ctloutput __P((struct socket *, struct sockopt *sopt));
-#else
int icmp6_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
-#endif
void ip6_init __P((void));
void ip6intr __P((void));
@@ -237,13 +224,8 @@ char * ip6_get_prevhdr __P((struct mbuf *, int));
int ip6_mforward __P((struct ip6_hdr *, struct ifnet *, struct mbuf *));
int ip6_process_hopopts __P((struct mbuf *, u_int8_t *, int, u_int32_t *,
u_int32_t *));
-#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(__OpenBSD__) || (defined(__bsdi__) && _BSDI_VERSION >= 199802)
void ip6_savecontrol __P((struct inpcb *, struct mbuf **, struct ip6_hdr *,
struct mbuf *));
-#else
-void ip6_savecontrol __P((struct in6pcb *, struct mbuf **, struct ip6_hdr *,
- struct mbuf *));
-#endif
int ip6_sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
void ip6_forward __P((struct mbuf *, int));
@@ -252,17 +234,9 @@ void ip6_mloopback __P((struct ifnet *, struct mbuf *, struct sockaddr_in6 *));
int ip6_output __P((struct mbuf *, struct ip6_pktopts *,
struct route_in6 *, int,
struct ip6_moptions *, struct ifnet **));
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
-int ip6_ctloutput __P((struct socket *, struct sockopt *sopt));
-#else
int ip6_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
-#endif
int ip6_setpktoptions __P((struct mbuf *, struct ip6_pktopts *, int));
-#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(__OpenBSD__) || (defined(__bsdi__) && _BSDI_VERSION >= 199802)
int ip6_optlen __P((struct inpcb *));
-#else
-int ip6_optlen __P((struct in6pcb *));
-#endif
int route6_input __P((struct mbuf **, int *, int));
@@ -273,11 +247,7 @@ void frag6_drain __P((void));
void rip6_init __P((void));
int rip6_input __P((struct mbuf **mp, int *offp, int proto));
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
-int rip6_ctloutput __P((struct socket *so, struct sockopt *sopt));
-#else
int rip6_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
-#endif
int rip6_output __P((struct mbuf *, ...));
int rip6_usrreq __P((struct socket *,
int, struct mbuf *, struct mbuf *, struct mbuf *, struct proc *));