svn commit: r260188 - head/sys/netinet

[Gleb Smirnoff]

Author: glebius
Date: Thu Jan  2 10:18:39 2014
New Revision: 260188
URL: http://svnweb.freebsd.org/changeset/base/260188

Log:
  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
  Submitted by:	ae

Modified:
  head/sys/netinet/ip_output.c

Modified: head/sys/netinet/ip_output.c
==============================================================================
--- head/sys/netinet/ip_output.c	Thu Jan  2 08:40:37 2014	(r260187)
+++ head/sys/netinet/ip_output.c	Thu Jan  2 10:18:39 2014	(r260188)
@@ -333,6 +333,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) {