diff options
author | bms <bms@FreeBSD.org> | 2007-02-24 21:09:35 +0000 |
---|---|---|
committer | bms <bms@FreeBSD.org> | 2007-02-24 21:09:35 +0000 |
commit | fcd6a02a5d5bf29f0733e164fe90b78b0efa3c04 (patch) | |
tree | 9392b62b58c2636c54630aa21c4fc275314ccdaf | |
parent | cb538c93c97ffa7557af7297f4cbe91b2944fb49 (diff) | |
download | FreeBSD-src-fcd6a02a5d5bf29f0733e164fe90b78b0efa3c04.zip FreeBSD-src-fcd6a02a5d5bf29f0733e164fe90b78b0efa3c04.tar.gz |
Fix tinderbox. ip6_mrouter should be defined in raw_ip6.c as it is
tested to determine if the userland socket is open; this, in turn, is
used to determine if the module has been loaded.
Tested with: LINT
-rw-r--r-- | sys/netinet6/ip6_mroute.c | 3 | ||||
-rw-r--r-- | sys/netinet6/raw_ip6.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index a6c238a..7780507 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -145,10 +145,9 @@ struct ip6protosw in6_pim_protosw = { }; /* - * Globals. All but ip6_mrouter, ip6_mrtproto and mrt6stat could be static, + * Globals. All but ip6_mrtproto and mrt6stat could be static, * except for netstat or debugging purposes. */ -struct socket *ip6_mrouter = NULL; int ip6_mrouter_ver = 0; int ip6_mrtproto = IPPROTO_PIM; /* for netstat only */ diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index 643c694..739d854 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -124,9 +124,7 @@ struct rip6stat rip6stat; /* * Hooks for multicast forwarding. */ - -struct socket *ip6_mrouter; - +struct socket *ip6_mrouter = NULL; int (*ip6_mrouter_set)(struct socket *, struct sockopt *); int (*ip6_mrouter_get)(struct socket *, struct sockopt *); int (*ip6_mrouter_done)(void); |