diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2005-06-08 06:43:08 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2005-06-08 06:43:08 +0000 |
| commit | d16865b346e8f9f72d7e70061bed76c9bba0b57e (patch) | |
| tree | 03675eef45a0d613a59d71c13a7806de43702e74 /sys | |
| parent | 236ecac5b889076b4d3279fe377bd0fd631d520d (diff) | |
kill some leftover bits from netns and iso routing
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/route.c | 6 | ||||
| -rw-r--r-- | sys/net/route.h | 4 | ||||
| -rw-r--r-- | sys/net/rtsock.c | 10 |
3 files changed, 3 insertions, 17 deletions
diff --git a/sys/net/route.c b/sys/net/route.c index ccfe02994c0..8f9a3044e24 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route.c,v 1.53 2005/06/08 03:13:49 henning Exp $ */ +/* $OpenBSD: route.c,v 1.54 2005/06/08 06:43:07 henning Exp $ */ /* $NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $ */ /* @@ -121,10 +121,6 @@ #include <netinet/in.h> #include <netinet/in_var.h> -#ifdef NS -#include <netns/ns.h> -#endif - #ifdef IPSEC #include <netinet/ip_ipsp.h> diff --git a/sys/net/route.h b/sys/net/route.h index 0a0c934e042..3d5d95ac872 100644 --- a/sys/net/route.h +++ b/sys/net/route.h @@ -1,4 +1,4 @@ -/* $OpenBSD: route.h,v 1.29 2005/05/27 17:18:20 mcbride Exp $ */ +/* $OpenBSD: route.h,v 1.30 2005/06/08 06:43:07 henning Exp $ */ /* $NetBSD: route.h,v 1.9 1996/02/13 22:00:49 christos Exp $ */ /* @@ -244,8 +244,6 @@ struct rt_addrinfo { struct route_cb { int ip_count; int ip6_count; - int ns_count; - int iso_count; int any_count; }; diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 9fecef9a33d..f550f99404b 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtsock.c,v 1.47 2005/06/07 18:21:44 henning Exp $ */ +/* $OpenBSD: rtsock.c,v 1.48 2005/06/08 06:43:07 henning Exp $ */ /* $NetBSD: rtsock.c,v 1.18 1996/03/29 00:32:10 cgd Exp $ */ /* @@ -121,10 +121,6 @@ route_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, route_cb.ip_count--; else if (af == AF_INET6) route_cb.ip6_count--; - else if (af == AF_NS) - route_cb.ns_count--; - else if (af == AF_ISO) - route_cb.iso_count--; route_cb.any_count--; } s = splsoftnet(); @@ -153,10 +149,6 @@ route_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, route_cb.ip_count++; else if (af == AF_INET6) route_cb.ip6_count++; - else if (af == AF_NS) - route_cb.ns_count++; - else if (af == AF_ISO) - route_cb.iso_count++; rp->rcb_faddr = &route_src; route_cb.any_count++; soisconnected(so); |