summaryrefslogtreecommitdiff
path: root/sys/net/if_gre.c
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2005-06-08 06:35:05 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2005-06-08 06:35:05 +0000
commit236ecac5b889076b4d3279fe377bd0fd631d520d (patch)
treeb894e294b9c76e48f65b7331f9d36dc1663d8e52 /sys/net/if_gre.c
parent05b708cd2939c4a39b7401fb597f0537f7ce2542 (diff)
no more netns handling for the various tunnel devices and loopback
Diffstat (limited to 'sys/net/if_gre.c')
-rw-r--r--sys/net/if_gre.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index f84091156a1..8310ff5404e 100644
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_gre.c,v 1.33 2005/05/14 19:24:23 brad Exp $ */
+/* $OpenBSD: if_gre.c,v 1.34 2005/06/08 06:35:04 henning Exp $ */
/* $NetBSD: if_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */
/*
@@ -74,11 +74,6 @@
#error "if_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>
@@ -389,11 +384,6 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
etype = ETHERTYPE_AT;
break;
#endif
-#ifdef NS
- case AF_NS:
- etype = ETHERTYPE_NS;
- break;
-#endif
#ifdef INET6
case AF_INET6:
etype = ETHERTYPE_IPV6;