summaryrefslogtreecommitdiff
path: root/sys/netinet
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2005-06-08 06:16:43 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2005-06-08 06:16:43 +0000
commitf91ae185e30a112583b7a1de428ddfedac4a6e4a (patch)
tree6eefb32595bc889d540f0a9b2795714c56acac22 /sys/netinet
parent07d9f4b437f294b15b93dcf7c7848fe8f3b2ec4a (diff)
netns bites the dust
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/ip_gre.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/sys/netinet/ip_gre.c b/sys/netinet/ip_gre.c
index a97d8c83654..8c65f1a3798 100644
--- a/sys/netinet/ip_gre.c
+++ b/sys/netinet/ip_gre.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_gre.c,v 1.25 2004/06/26 21:37:09 pb Exp $ */
+/* $OpenBSD: ip_gre.c,v 1.26 2005/06/08 06:16:42 henning Exp $ */
/* $NetBSD: ip_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */
/*
@@ -69,11 +69,6 @@
#error "ip_gre used without inet"
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#ifdef NETATALK
#include <netatalk/at.h>
#include <netatalk/at_var.h>
@@ -167,13 +162,6 @@ gre_input2(m , hlen, proto)
ifq = &ipintrq; /* we are in ip_input */
af = AF_INET;
break;
-#ifdef NS
- case ETHERTYPE_NS:
- ifq = &nsintrq;
- schednetisr(NETISR_NS);
- af = AF_NS;
- break;
-#endif
#ifdef NETATALK
case ETHERTYPE_AT:
ifq = &atintrq1;