From owner-svn-src-stable@FreeBSD.ORG  Fri Feb 14 08:20:33 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 07961EAB;
 Fri, 14 Feb 2014 08:20:33 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E75451C22;
 Fri, 14 Feb 2014 08:20:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1E8KWgH025104;
 Fri, 14 Feb 2014 08:20:32 GMT
 (envelope-from brueffer@svn.freebsd.org)
Received: (from brueffer@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1E8KW4u025103;
 Fri, 14 Feb 2014 08:20:32 GMT
 (envelope-from brueffer@svn.freebsd.org)
Message-Id: <201402140820.s1E8KW4u025103@svn.freebsd.org>
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Fri, 14 Feb 2014 08:20:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r261876 - stable/10/share/man/man4
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Feb 2014 08:20:33 -0000

Author: brueffer
Date: Fri Feb 14 08:20:32 2014
New Revision: 261876
URL: http://svnweb.freebsd.org/changeset/base/261876

Log:
  MFC: r261584
  
  In IPv6 code examples, use the correct v6 socket.

Modified:
  stable/10/share/man/man4/multicast.4
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/man/man4/multicast.4
==============================================================================
--- stable/10/share/man/man4/multicast.4	Fri Feb 14 07:43:39 2014	(r261875)
+++ stable/10/share/man/man4/multicast.4	Fri Feb 14 08:20:32 2014	(r261876)
@@ -326,7 +326,7 @@ mc.mf6cc_parent = iif_index;
 for (i = 0; i < maxvifs; i++)
     if (oifs_ttl[i] > 0)
         IF_SET(i, &mc.mf6cc_ifset);
-setsockopt(mrouter_s4, IPPROTO_IPV6, MRT6_ADD_MFC,
+setsockopt(mrouter_s6, IPPROTO_IPV6, MRT6_ADD_MFC,
            (void *)&mc, sizeof(mc));
 .Ed
 .Pp
@@ -365,7 +365,7 @@ struct mf6cctl mc;
 memset(&mc, 0, sizeof(mc));
 memcpy(&mc.mf6cc_origin, &source_addr, sizeof(mc.mf6cc_origin));
 memcpy(&mc.mf6cc_mcastgrp, &group_addr, sizeof(mf6cc_mcastgrp));
-setsockopt(mrouter_s4, IPPROTO_IPV6, MRT6_DEL_MFC,
+setsockopt(mrouter_s6, IPPROTO_IPV6, MRT6_DEL_MFC,
            (void *)&mc, sizeof(mc));
 .Ed
 .Pp