diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2004-03-25 08:46:27 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2004-03-25 08:46:27 +0000 |
| commit | 26f16ebeb1a790823e21cca2b3e720fc34bc1620 (patch) | |
| tree | 710d4f143403eec84e83bfe99cc3d874847f03bd /sys | |
| parent | 9fcc066d3e4f94a9c2250a1bcedbe75d4b1a19ce (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/ip_output.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index a83cfa94f7fb..ccab9af024ca 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -338,18 +338,6 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, ip->ip_src = IA_SIN(ia)->sin_addr; } - if (ip_mrouter && (flags & IP_FORWARDING) == 0) { - /* - * XXX - * delayed checksums are not currently - * compatible with IP multicast routing - */ - if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA) { - in_delayed_cksum(m); - m->m_pkthdr.csum_flags &= - ~CSUM_DELAY_DATA; - } - } IN_LOOKUP_MULTI(pkt_dst, ifp, inm); if (inm != NULL && (imo == NULL || imo->imo_multicast_loop)) { @@ -2232,8 +2220,10 @@ ip_mloopback(ifp, m, dst, hlen) copym->m_pkthdr.rcvif = ifp; ip_input(copym); #else - /* if the checksum hasn't been computed, mark it as valid */ + /* If needed, compute the checksum and mark it as valid. */ if (copym->m_pkthdr.csum_flags & CSUM_DELAY_DATA) { + in_delayed_cksum(copym); + copym->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA; copym->m_pkthdr.csum_flags |= CSUM_DATA_VALID | CSUM_PSEUDO_HDR; copym->m_pkthdr.csum_data = 0xffff; |