From owner-svn-src-all@FreeBSD.ORG  Mon Jan  6 19:14:47 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 705D6BB;
 Mon,  6 Jan 2014 19:14:47 +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 5C43411BD;
 Mon,  6 Jan 2014 19:14:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s06JEl66000367;
 Mon, 6 Jan 2014 19:14:47 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s06JElaM000366;
 Mon, 6 Jan 2014 19:14:47 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201401061914.s06JElaM000366@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Mon, 6 Jan 2014 19:14:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r260378 - releng/10.0/sys/netinet
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Jan 2014 19:14:47 -0000

Author: glebius
Date: Mon Jan  6 19:14:46 2014
New Revision: 260378
URL: http://svnweb.freebsd.org/changeset/base/260378

Log:
  Merge r260319 from stable/10 (r260188 from head):
  
    Fix regression from r249894. Now we pass "gw" as argument to if_output
    method, thus for multicast case we need it to point at "dst".
  
  PR:		185395
  Approved by:	re (gjb)

Modified:
  releng/10.0/sys/netinet/ip_output.c
Directory Properties:
  releng/10.0/   (props changed)

Modified: releng/10.0/sys/netinet/ip_output.c
==============================================================================
--- releng/10.0/sys/netinet/ip_output.c	Mon Jan  6 19:05:04 2014	(r260377)
+++ releng/10.0/sys/netinet/ip_output.c	Mon Jan  6 19:14:46 2014	(r260378)
@@ -331,6 +331,12 @@ again:
 	if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) {
 		m->m_flags |= M_MCAST;
 		/*
+		 * IP destination address is multicast.  Make sure "gw"
+		 * still points to the address in "ro".  (It may have been
+		 * changed to point to a gateway address, above.)
+		 */
+		gw = dst;
+		/*
 		 * See if the caller provided any multicast options
 		 */
 		if (imo != NULL) {