 @@ -1,14 +1,14 @@
-/*	$NetBSD: ip_output.c,v 1.318 2020/08/28 06:31:42 ozaki-r Exp $	*/
+/*	$NetBSD: ip_output.c,v 1.319 2020/08/28 17:01:48 christos Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -81,27 +81,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)ip_output.c	8.3 (Berkeley) 1/21/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.318 2020/08/28 06:31:42 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.319 2020/08/28 17:01:48 christos Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #include "opt_mrouting.h"
 #include "opt_net_mpsafe.h"
 #include "opt_mpls.h"
 #endif
 #include "arp.h"
 #include <sys/param.h>
 #include <sys/kmem.h>
 @@ -680,28 +680,26 @@ sendit:
 			 */
 			error = 0;
 		else
 			error = EADDRNOTAVAIL;
 		goto bad;
+	}
 	/* Maybe skip checksums on loopback interfaces. */
 	if (IN_NEED_CHECKSUM(ifp, M_CSUM_IPv4)) {
 		m->m_pkthdr.csum_flags |= M_CSUM_IPv4;
+	}
 	sw_csum = m->m_pkthdr.csum_flags & ~ifp->if_csum_flags_tx;
 	sa = (m->m_flags & M_MCAST) ? sintocsa(rdst) : sintocsa(dst);
 	/* Need to fragment the packet */
 	if (ntohs(ip->ip_len) > mtu &&
 	    (m->m_pkthdr.csum_flags & M_CSUM_TSOv4) == 0) {
 		goto fragment;
+	}
 #if IFA_STATS
 	if (ia)
 		ia->ia_ifa.ifa_data.ifad_outbytes += ntohs(ip->ip_len);
 #endif
 	/*
 	 * Always initialize the sum to 0!  Some HW assisted
 	 * checksumming requires this.
 @@ -721,26 +719,28 @@ sendit:
 			ip->ip_sum = in_cksum(m, hlen);
 			m->m_pkthdr.csum_flags &= ~M_CSUM_IPv4;
+		}
 		if (sw_csum & (M_CSUM_TCPv4|M_CSUM_UDPv4)) {
 			if (IN_NEED_CHECKSUM(ifp,
 			    sw_csum & (M_CSUM_TCPv4|M_CSUM_UDPv4))) {
 				in_undefer_cksum_tcpudp(m);
+			}
 			m->m_pkthdr.csum_flags &=
 			    ~(M_CSUM_TCPv4|M_CSUM_UDPv4);
+		}
+	}
 	sa = (m->m_flags & M_MCAST) ? sintocsa(rdst) : sintocsa(dst);
 	/* Send it */
 	if (__predict_false(sw_csum & M_CSUM_TSOv4)) {
 		/*
 		 * TSO4 is required by a packet, but disabled for
 		 * the interface.
 		 */
 		error = ip_tso_output(ifp, m, sa, rt);
 	} else
 		error = ip_if_output(ifp, m, sa, rt);
 	goto done;
 fragment:
 	/*
 @@ -790,27 +790,28 @@ fragment:
 		/*
 		 * If we get there, the packet has not been handled by
 		 * IPsec whereas it should have. Now that it has been
 		 * fragmented, re-inject it in ip_output so that IPsec
 		 * processing can occur.
 		 */
 		if (natt_frag) {
 			error = ip_output(m, opt, NULL,
 			    flags | IP_RAWOUTPUT | IP_NOIPNEWID,
 			    imo, inp);
 		} else {
 			KASSERT((m->m_pkthdr.csum_flags &
 			    (M_CSUM_UDPv4 | M_CSUM_TCPv4)) == 0);
-			error = ip_if_output(ifp, m, sa, rt);
+			error = ip_if_output(ifp, m, (m->m_flags & M_MCAST) ?
 			    sintocsa(rdst) : sintocsa(dst), rt);
+		}
+	}
 	if (error == 0) {
 		IP_STATINC(IP_STAT_FRAGMENTED);
+	}
 done:
 	ia4_release(ia, &psref_ia);
 	rtcache_unref(rt, ro);
 	if (ro == &iproute) {
 		rtcache_free(&iproute);
+	}
 	if (mifp != NULL) {