diff options
author | peter <peter@FreeBSD.org> | 2003-03-05 19:24:24 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2003-03-05 19:24:24 +0000 |
commit | fbc7526e8f7461209707f4f096b1ec1f9f4aca7b (patch) | |
tree | 5244a504fc54940e377f138f4f959da0cbad8ceb /sys/netinet | |
parent | f9806b180393c9a3dbdc1792c27c8175975ff756 (diff) | |
download | FreeBSD-src-fbc7526e8f7461209707f4f096b1ec1f9f4aca7b.zip FreeBSD-src-fbc7526e8f7461209707f4f096b1ec1f9f4aca7b.tar.gz |
Finish driving a stake through the heart of netns and the associated
ifdefs scattered around the place - its dead Jim!
The SMB stuff had stolen AF_NS, make it official.
Diffstat (limited to 'sys/netinet')
-rw-r--r-- | sys/netinet/in_proto.c | 13 | ||||
-rw-r--r-- | sys/netinet/ip_gre.c | 11 |
2 files changed, 0 insertions, 24 deletions
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c index a2a528f..47c8b24 100644 --- a/sys/netinet/in_proto.c +++ b/sys/netinet/in_proto.c @@ -85,11 +85,6 @@ #include <netipx/ipx_ip.h> #endif -#ifdef NSIP -#include <netns/ns.h> -#include <netns/ns_if.h> -#endif - extern struct domain inetdomain; static struct pr_usrreqs nousrreqs; @@ -221,14 +216,6 @@ struct protosw inetsw[] = { &rip_usrreqs }, #endif -#ifdef NSIP -{ SOCK_RAW, &inetdomain, IPPROTO_IDP, PR_ATOMIC|PR_ADDR|PR_LASTHDR, - idpip_input, 0, nsip_ctlinput, 0, - 0, - 0, 0, 0, 0, - &rip_usrreqs -}, -#endif /* raw wildcard */ { SOCK_RAW, &inetdomain, 0, PR_ATOMIC|PR_ADDR, rip_input, 0, 0, rip_ctloutput, diff --git a/sys/netinet/ip_gre.c b/sys/netinet/ip_gre.c index 89e0955..fc6468b 100644 --- a/sys/netinet/ip_gre.c +++ b/sys/netinet/ip_gre.c @@ -44,7 +44,6 @@ */ #include "opt_inet.h" -#include "opt_ns.h" #include "opt_atalk.h" #include <sys/param.h> @@ -76,11 +75,6 @@ #error ip_gre input without IP? #endif -#ifdef NS -#include <netns/ns.h> -#include <netns/ns_if.h> -#endif - #ifdef NETATALK #include <netatalk/at.h> #include <netatalk/at_var.h> @@ -181,11 +175,6 @@ gre_input2(struct mbuf *m ,int hlen, u_char proto) case WCCP_PROTOCOL_TYPE: /* we are in ip_input */ isr = NETISR_IP; break; -#ifdef NS - case ETHERTYPE_NS: - isr = NETISR_NS; - break; -#endif #ifdef NETATALK case ETHERTYPE_ATALK: isr = NETISR_ATALK1; |