diff options
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_enc.c | 6 | ||||
| -rw-r--r-- | sys/net/if_gre.c | 12 | ||||
| -rw-r--r-- | sys/net/if_loop.c | 19 | ||||
| -rw-r--r-- | sys/net/if_tun.c | 7 |
4 files changed, 4 insertions, 40 deletions
diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c index 4e2c68e2fae..9d2afcff123 100644 --- a/sys/net/if_enc.c +++ b/sys/net/if_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_enc.c,v 1.41 2004/09/15 17:46:44 grange Exp $ */ +/* $OpenBSD: if_enc.c,v 1.42 2005/06/08 06:35:04 henning Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -62,10 +62,6 @@ #include <netinet6/nd6.h> #endif /* INET6 */ -#ifdef NS -extern struct ifqueue nsintrq; -#endif - #include "bpfilter.h" #include "enc.h" 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; diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c index 97ab1f34376..c2f77ad859c 100644 --- a/sys/net/if_loop.c +++ b/sys/net/if_loop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_loop.c,v 1.33 2004/07/16 15:01:09 henning Exp $ */ +/* $OpenBSD: if_loop.c,v 1.34 2005/06/08 06:35:04 henning Exp $ */ /* $NetBSD: if_loop.c,v 1.15 1996/05/07 02:40:33 thorpej Exp $ */ /* @@ -138,11 +138,6 @@ #include <netinet/ip6.h> #endif -#ifdef NS -#include <netns/ns.h> -#include <netns/ns_if.h> -#endif - #ifdef IPX #include <netipx/ipx.h> #include <netipx/ipx_if.h> @@ -321,12 +316,6 @@ looutput(ifp, m, dst, rt) isr = NETISR_IPV6; break; #endif /* INET6 */ -#ifdef NS - case AF_NS: - ifq = &nsintrq; - isr = NETISR_NS; - break; -#endif #ifdef IPX case AF_IPX: ifq = &ipxintrq; @@ -401,12 +390,6 @@ lo_altqstart(ifp) isr = NETISR_IPX; break; #endif -#ifdef NS - case AF_NS: - ifq = &nsintrq; - isr = NETISR_NS; - break; -#endif #ifdef NETATALK case AF_APPLETALK: ifq = &atintrq2; diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index 7c7c2081f4d..7ef03da138c 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tun.c,v 1.66 2005/05/04 12:10:27 markus Exp $ */ +/* $OpenBSD: if_tun.c,v 1.67 2005/06/08 06:35:04 henning Exp $ */ /* $NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $ */ /* @@ -71,11 +71,6 @@ #include <netinet/if_ether.h> #endif -#ifdef NS -#include <netns/ns.h> -#include <netns/ns_if.h> -#endif - #ifdef IPX #include <netipx/ipx.h> #include <netipx/ipx_if.h> |