Remove the "multicast_" prefix from the fields a multicast-only struct.

Prodded by claudio@ and mikeb@

6 files changed, 29 insertions, 29 deletions

diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index 0e62941c189..5bcc939ded3 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -1439,8 +1439,8 @@ phyint_send(struct ip6_hdr *ip6, struct mif6 *mifp, struct mbuf *m)
 
 		im6o.im6o_ifidx = ifp->if_index;
 		/* XXX: ip6_output will override ip6->ip6_hlim */
-		im6o.im6o_multicast_hlim = ip6->ip6_hlim;
-		im6o.im6o_multicast_loop = 1;
+		im6o.im6o_hlim = ip6->ip6_hlim;
+		im6o.im6o_loop = 1;
 		error = ip6_output(mb_copy, NULL, &ro, IPV6_FORWARDING, &im6o,
 		    NULL, NULL);
 
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 4e052947b12..92879462518 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_output.c,v 1.164 2014/12/17 09:45:59 mpi Exp $	*/
+/*	$OpenBSD: ip6_output.c,v 1.165 2014/12/17 09:57:13 mpi Exp $	*/
 /*	$KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $	*/
 
 /*
@@ -482,7 +482,7 @@ reroute:
 		ip6->ip6_hlim = opt->ip6po_hlim & 0xff;
 	else if (IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst)) {
 		if (im6o != NULL)
-			ip6->ip6_hlim = im6o->im6o_multicast_hlim;
+			ip6->ip6_hlim = im6o->im6o_hlim;
 		else
 			ip6->ip6_hlim = ip6_defmcasthlim;
 	}
@@ -615,7 +615,7 @@ reroute:
 		}
 		IN6_LOOKUP_MULTI(ip6->ip6_dst, ifp, in6m);
 		if (in6m != NULL &&
-		    (im6o == NULL || im6o->im6o_multicast_loop)) {
+		    (im6o == NULL || im6o->im6o_loop)) {
 			/*
 			 * If we belong to the destination multicast group
 			 * on the outgoing interface, and the caller did not
@@ -2330,8 +2330,8 @@ ip6_setmoptions(int optname, struct ip6_moptions **im6op, struct mbuf *m)
 			return (ENOBUFS);
 		*im6op = im6o;
 		im6o->im6o_ifidx = 0;
-		im6o->im6o_multicast_hlim = ip6_defmcasthlim;
-		im6o->im6o_multicast_loop = IPV6_DEFAULT_MULTICAST_LOOP;
+		im6o->im6o_hlim = ip6_defmcasthlim;
+		im6o->im6o_loop = IPV6_DEFAULT_MULTICAST_LOOP;
 		LIST_INIT(&im6o->im6o_memberships);
 	}
 
@@ -2376,9 +2376,9 @@ ip6_setmoptions(int optname, struct ip6_moptions **im6op, struct mbuf *m)
 		if (optval < -1 || optval >= 256)
 			error = EINVAL;
 		else if (optval == -1)
-			im6o->im6o_multicast_hlim = ip6_defmcasthlim;
+			im6o->im6o_hlim = ip6_defmcasthlim;
 		else
-			im6o->im6o_multicast_hlim = optval;
+			im6o->im6o_hlim = optval;
 		break;
 	    }
 
@@ -2396,7 +2396,7 @@ ip6_setmoptions(int optname, struct ip6_moptions **im6op, struct mbuf *m)
 			error = EINVAL;
 			break;
 		}
-		im6o->im6o_multicast_loop = loop;
+		im6o->im6o_loop = loop;
 		break;
 
 	case IPV6_JOIN_GROUP:
@@ -2573,8 +2573,8 @@ ip6_setmoptions(int optname, struct ip6_moptions **im6op, struct mbuf *m)
 	 * structure.
 	 */
 	if (im6o->im6o_ifidx == 0 &&
-	    im6o->im6o_multicast_hlim == ip6_defmcasthlim &&
-	    im6o->im6o_multicast_loop == IPV6_DEFAULT_MULTICAST_LOOP &&
+	    im6o->im6o_hlim == ip6_defmcasthlim &&
+	    im6o->im6o_loop == IPV6_DEFAULT_MULTICAST_LOOP &&
 	    LIST_EMPTY(&im6o->im6o_memberships)) {
 		free(*im6op, M_IPMOPTS, 0);
 		*im6op = NULL;
@@ -2610,7 +2610,7 @@ ip6_getmoptions(int optname, struct ip6_moptions *im6o, struct mbuf **mp)
 		if (im6o == NULL)
 			*hlim = ip6_defmcasthlim;
 		else
-			*hlim = im6o->im6o_multicast_hlim;
+			*hlim = im6o->im6o_hlim;
 		return (0);
 
 	case IPV6_MULTICAST_LOOP:
@@ -2619,7 +2619,7 @@ ip6_getmoptions(int optname, struct ip6_moptions *im6o, struct mbuf **mp)
 		if (im6o == NULL)
 			*loop = ip6_defmcasthlim;
 		else
-			*loop = im6o->im6o_multicast_loop;
+			*loop = im6o->im6o_loop;
 		return (0);
 
 	default:
diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h
index 371da75783b..b02cd707b6d 100644
--- a/sys/netinet6/ip6_var.h
+++ b/sys/netinet6/ip6_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_var.h,v 1.50 2014/12/17 09:45:59 mpi Exp $	*/
+/*	$OpenBSD: ip6_var.h,v 1.51 2014/12/17 09:57:13 mpi Exp $	*/
 /*	$KAME: ip6_var.h,v 1.33 2000/06/11 14:59:20 jinmei Exp $	*/
 
 /*
@@ -94,8 +94,8 @@ struct	ip6asfrag {
 struct	ip6_moptions {
 	LIST_HEAD(, in6_multi_mship) im6o_memberships;
 	unsigned short im6o_ifidx;	/* ifp index for outgoing multicasts */
-	u_char	im6o_multicast_hlim;	/* hoplimit for outgoing multicasts */
-	u_char	im6o_multicast_loop;	/* 1 >= hear sends if a member */
+	u_char	im6o_hlim;	/* hoplimit for outgoing multicasts */
+	u_char	im6o_loop;	/* 1 >= hear sends if a member */
 };
 
 /*
diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c
index 8364d591c38..f864299c290 100644
--- a/sys/netinet6/mld6.c
+++ b/sys/netinet6/mld6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mld6.c,v 1.40 2014/12/17 09:45:59 mpi Exp $	*/
+/*	$OpenBSD: mld6.c,v 1.41 2014/12/17 09:57:13 mpi Exp $	*/
 /*	$KAME: mld6.c,v 1.26 2001/02/16 14:50:35 itojun Exp $	*/
 
 /*
@@ -418,7 +418,7 @@ mld6_sendpkt(struct in6_multi *in6m, int type, const struct in6_addr *dst)
 	ip6->ip6_vfc |= IPV6_VERSION;
 	/* ip6_plen will be set later */
 	ip6->ip6_nxt = IPPROTO_ICMPV6;
-	/* ip6_hlim will be set by im6o.im6o_multicast_hlim */
+	/* ip6_hlim will be set by im6o.im6o_hlim */
 	ip6->ip6_src = ia6 ? ia6->ia_addr.sin6_addr : in6addr_any;
 	ip6->ip6_dst = dst ? *dst : in6m->in6m_addr;
 
@@ -439,14 +439,14 @@ mld6_sendpkt(struct in6_multi *in6m, int type, const struct in6_addr *dst)
 	/* construct multicast option */
 	bzero(&im6o, sizeof(im6o));
 	im6o.im6o_ifidx = ifp->if_index;
-	im6o.im6o_multicast_hlim = 1;
+	im6o.im6o_hlim = 1;
 
 	/*
 	 * Request loopback of the report if we are acting as a multicast
 	 * router, so that the process-level routing daemon can hear it.
 	 */
 #ifdef MROUTING
-	im6o.im6o_multicast_loop = (ip6_mrouter != NULL);
+	im6o.im6o_loop = (ip6_mrouter != NULL);
 #endif
 
 	/* increment output statictics */
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
index c3c488aa441..a7420585170 100644
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nd6_nbr.c,v 1.87 2014/12/17 09:45:59 mpi Exp $	*/
+/*	$OpenBSD: nd6_nbr.c,v 1.88 2014/12/17 09:57:13 mpi Exp $	*/
 /*	$KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $	*/
 
 /*
@@ -399,8 +399,8 @@ nd6_ns_output(struct ifnet *ifp, struct in6_addr *daddr6,
 	if (daddr6 == NULL || IN6_IS_ADDR_MULTICAST(daddr6)) {
 		m->m_flags |= M_MCAST;
 		im6o.im6o_ifidx = ifp->if_index;
-		im6o.im6o_multicast_hlim = 255;
-		im6o.im6o_multicast_loop = 0;
+		im6o.im6o_hlim = 255;
+		im6o.im6o_loop = 0;
 	}
 
 	icmp6len = sizeof(*nd_ns);
@@ -950,8 +950,8 @@ nd6_na_output(struct ifnet *ifp, struct in6_addr *daddr6,
 	if (IN6_IS_ADDR_MULTICAST(daddr6)) {
 		m->m_flags |= M_MCAST;
 		im6o.im6o_ifidx = ifp->if_index;
-		im6o.im6o_multicast_hlim = 255;
-		im6o.im6o_multicast_loop = 0;
+		im6o.im6o_hlim = 255;
+		im6o.im6o_loop = 0;
 	}
 
 	icmp6len = sizeof(*nd_na);
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c
index b5656990849..0494cc08814 100644
--- a/sys/netinet6/nd6_rtr.c
+++ b/sys/netinet6/nd6_rtr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nd6_rtr.c,v 1.93 2014/12/17 09:45:59 mpi Exp $	*/
+/*	$OpenBSD: nd6_rtr.c,v 1.94 2014/12/17 09:57:13 mpi Exp $	*/
 /*	$KAME: nd6_rtr.c,v 1.97 2001/02/07 11:09:13 itojun Exp $	*/
 
 /*
@@ -203,8 +203,8 @@ nd6_rs_output(struct ifnet* ifp, struct in6_ifaddr *ia6)
 	m->m_pkthdr.csum_flags |= M_ICMP_CSUM_OUT;
 
 	im6o.im6o_ifidx = ifp->if_index;
-	im6o.im6o_multicast_hlim = 255;
-	im6o.im6o_multicast_loop = 0;
+	im6o.im6o_hlim = 255;
+	im6o.im6o_loop = 0;
 
 	icmp6len = sizeof(*rs);
 	m->m_pkthdr.len = m->m_len = sizeof(*ip6) + icmp6len;