svn commit: r227885 - stable/9/sys/netinet6

[Bjoern A. Zeeb]

Author: bz
Date: Wed Nov 23 15:10:15 2011
New Revision: 227885
URL: http://svn.freebsd.org/changeset/base/227885

Log:
  MFC r227481:
  
    Return the correct value for the IPV6_MULTICAST_HOPS getsockopt() call.
  
    Submitted by:	rpaulo
  
  Approved by:	re (kib)

Modified:
  stable/9/sys/netinet6/in6_mcast.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)

Modified: stable/9/sys/netinet6/in6_mcast.c
==============================================================================
--- stable/9/sys/netinet6/in6_mcast.c	Wed Nov 23 15:03:15 2011	(r227884)
+++ stable/9/sys/netinet6/in6_mcast.c	Wed Nov 23 15:10:15 2011	(r227885)
@@ -1713,7 +1713,7 @@ ip6_getmoptions(struct inpcb *inp, struc
 		if (im6o == NULL)
 			optval = V_ip6_defmcasthlim;
 		else
-			optval = im6o->im6o_multicast_loop;
+			optval = im6o->im6o_multicast_hlim;
 		INP_WUNLOCK(inp);
 		error = sooptcopyout(sopt, &optval, sizeof(u_int));
 		break;