diff options
| author | brooks <brooks@FreeBSD.org> | 2001-07-02 21:02:09 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2001-07-02 21:02:09 +0000 |
| commit | e7b9bc714f516674681231706c48e6aaa41c1d52 (patch) | |
| tree | c356b4fb3bb3f0b8afdc188117e65b43ba086e89 /sys/netinet6 | |
| parent | 1e69f4eb2364d7e5da7ca1d7cb99c3e77599e36d (diff) | |
| download | FreeBSD-src-e7b9bc714f516674681231706c48e6aaa41c1d52.zip FreeBSD-src-e7b9bc714f516674681231706c48e6aaa41c1d52.tar.gz | |
gif(4) and stf(4) modernization:
- Remove gif dependencies from stf.
- Make gif and stf into modules
- Make gif cloneable.
PR: kern/27983
Reviewed by: ru, ume
Obtained from: NetBSD
MFC after: 1 week
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/in6.c | 5 | ||||
| -rw-r--r-- | sys/netinet6/in6_proto.c | 19 | ||||
| -rw-r--r-- | sys/netinet6/ip6_input.c | 1 |
3 files changed, 0 insertions, 25 deletions
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 1fd566b..b17eaa1 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -105,11 +105,6 @@ #include <netinet6/in6_pcb.h> #endif -#include "gif.h" -#if NGIF > 0 -#include <net/if_gif.h> -#endif - #include <net/net_osdep.h> MALLOC_DEFINE(M_IPMADDR, "in6_multi", "internet multicast address"); diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index 1159915..9b1b819 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -128,11 +128,6 @@ #include <netinet6/ip6protosw.h> -#include "gif.h" -#if NGIF > 0 -#include <netinet6/in6_gif.h> -#endif - #include <net/net_osdep.h> /* @@ -251,16 +246,6 @@ struct ip6protosw inet6sw[] = { }, }; -#if NGIF > 0 -struct ip6protosw in6_gif_protosw = -{ SOCK_RAW, &inet6domain, 0/*IPPROTO_IPV[46]*/, PR_ATOMIC|PR_ADDR, - in6_gif_input, rip6_output, 0, rip6_ctloutput, - 0, - 0, 0, 0, 0, - &rip6_usrreqs -}; -#endif /*NGIF*/ - extern int in6_inithead __P((void **, int)); struct domain inet6domain = @@ -299,11 +284,7 @@ int ip6_hdrnestlimit = 50; /* appropriate? */ int ip6_dad_count = 1; /* DupAddrDetectionTransmits */ u_int32_t ip6_flow_seq; int ip6_auto_flowlabel = 1; -#if NGIF > 0 -int ip6_gif_hlim = GIF_HLIM; -#else int ip6_gif_hlim = 0; -#endif int ip6_use_deprecated = 1; /* allow deprecated addr (RFC2462 5.5.4) */ int ip6_rr_prune = 5; /* router renumbering prefix * walk list every 5 sec. */ diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 4b10d8e..f4a0307 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -121,7 +121,6 @@ #include <netinet6/ip6protosw.h> #include "faith.h" -#include "gif.h" #include <net/net_osdep.h> |
