svn commit: r260378 - releng/10.0/sys/netinet

[Gleb Smirnoff]

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) {