svn commit: r260319 - stable/10/sys/netinet

[Gleb Smirnoff]

Author: glebius
Date: Sun Jan  5 13:55:33 2014
New Revision: 260319
URL: http://svnweb.freebsd.org/changeset/base/260319

Log:
  Merge 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

Modified:
  stable/10/sys/netinet/ip_output.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netinet/ip_output.c
==============================================================================
--- stable/10/sys/netinet/ip_output.c	Sun Jan  5 11:58:07 2014	(r260318)
+++ stable/10/sys/netinet/ip_output.c	Sun Jan  5 13:55:33 2014	(r260319)
@@ -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) {