summaryrefslogtreecommitdiff
path: root/sys/netinet6/icmp6.c
diff options
context:
space:
mode:
authorAngelos D. Keromytis <angelos@cvs.openbsd.org>2001-06-09 06:43:39 +0000
committerAngelos D. Keromytis <angelos@cvs.openbsd.org>2001-06-09 06:43:39 +0000
commit5ddbbd9807b495d0890ca9907b336fbf4ec750a6 (patch)
tree815cd14bcc5d22949999b176687a2e1c93bd90ae /sys/netinet6/icmp6.c
parent75509732266590a78449120024a995200067d913 (diff)
No need for net/net_osdep.h
Diffstat (limited to 'sys/netinet6/icmp6.c')
-rw-r--r--sys/netinet6/icmp6.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index e09255d997a..f523abb9945 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: icmp6.c,v 1.42 2001/06/01 06:08:22 itojun Exp $ */
+/* $OpenBSD: icmp6.c,v 1.43 2001/06/09 06:43:37 angelos Exp $ */
/* $KAME: icmp6.c,v 1.212 2001/06/01 05:35:52 jinmei Exp $ */
/*
@@ -99,8 +99,6 @@
#include "faith.h"
-#include <net/net_osdep.h>
-
/* inpcb members */
#define in6pcb inpcb
#define in6p_laddr inp_laddr6
@@ -2747,11 +2745,11 @@ fail:
m_freem(m0);
}
-#ifdef HAVE_NRL_INPCB
+/* NRL PCB */
#define sotoin6pcb sotoinpcb
#define in6pcb inpcb
#define in6p_icmp6filt inp_icmp6filt
-#endif
+
/*
* ICMPv6 socket option processing.
*/
@@ -2833,11 +2831,11 @@ icmp6_ctloutput(op, so, level, optname, mp)
return(error);
}
-#ifdef HAVE_NRL_INPCB
+
+/* NRL PCB */
#undef sotoin6pcb
#undef in6pcb
#undef in6p_icmp6filt
-#endif
/*
* Perform rate limit check.