diff options
| author | kevlo <kevlo@FreeBSD.org> | 2014-08-08 01:57:15 +0000 |
|---|---|---|
| committer | kevlo <kevlo@FreeBSD.org> | 2014-08-08 01:57:15 +0000 |
| commit | 7727a3c21521a720a63dfae179944a2c6272e150 (patch) | |
| tree | b8a22569ba8e281cdf06effd47986cf8fb592118 /sys/netinet6/in6_gif.c | |
| parent | 71993ad111538df7d3ea090e597413a9bbc198a5 (diff) | |
| download | FreeBSD-src-7727a3c21521a720a63dfae179944a2c6272e150.zip FreeBSD-src-7727a3c21521a720a63dfae179944a2c6272e150.tar.gz | |
Merge 'struct ip6protosw' and 'struct protosw' into one. Now we have
only one protocol switch structure that is shared between ipv4 and ipv6.
Phabric: D476
Reviewed by: jhb
Diffstat (limited to 'sys/netinet6/in6_gif.c')
| -rw-r--r-- | sys/netinet6/in6_gif.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c index 28fa823..f740b37 100644 --- a/sys/netinet6/in6_gif.c +++ b/sys/netinet6/in6_gif.c @@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$"); #include <netinet6/in6_gif.h> #include <netinet6/in6_var.h> #endif -#include <netinet6/ip6protosw.h> #include <netinet/ip_ecn.h> #ifdef INET6 #include <netinet6/ip6_ecn.h> @@ -84,13 +83,13 @@ static int gif_validate6(const struct ip6_hdr *, struct gif_softc *, struct ifnet *); extern struct domain inet6domain; -struct ip6protosw in6_gif_protosw = { +struct protosw in6_gif_protosw = { .pr_type = SOCK_RAW, .pr_domain = &inet6domain, .pr_protocol = 0, /* IPPROTO_IPV[46] */ .pr_flags = PR_ATOMIC|PR_ADDR, .pr_input = in6_gif_input, - .pr_output = rip6_output, + .pr_output = (pr_output_t *)rip6_output, .pr_ctloutput = rip6_ctloutput, .pr_usrreqs = &rip6_usrreqs }; |
