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/ip6_mroute.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/ip6_mroute.c')
| -rw-r--r-- | sys/netinet6/ip6_mroute.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 1ded0f6..77bff1f 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -121,7 +121,6 @@ __FBSDID("$FreeBSD$"); #include <netinet6/scope6_var.h> #include <netinet6/nd6.h> #include <netinet6/ip6_mroute.h> -#include <netinet6/ip6protosw.h> #include <netinet6/pim6.h> #include <netinet6/pim6_var.h> @@ -141,13 +140,13 @@ extern int in6_mcast_loop; extern struct domain inet6domain; static const struct encaptab *pim6_encap_cookie; -static const struct ip6protosw in6_pim_protosw = { +static const struct protosw in6_pim_protosw = { .pr_type = SOCK_RAW, .pr_domain = &inet6domain, .pr_protocol = IPPROTO_PIM, .pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR, .pr_input = pim6_input, - .pr_output = rip6_output, + .pr_output = (pr_output_t *)rip6_output, .pr_ctloutput = rip6_ctloutput, .pr_usrreqs = &rip6_usrreqs }; |
