diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2021-11-16 18:38:09 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2021-11-30 01:35:20 +0000 |
| commit | 5b5bbf2e7c341ec6ba569536fb14acb990d53334 (patch) | |
| tree | 102b89201c6dcc090c4ed0efa886b1fa8afee765 /sys/netinet | |
| parent | 422456ae27f5f79dee3969de9190fbe9b9301c3c (diff) | |
| download | src-5b5bbf2e7c341ec6ba569536fb14acb990d53334.tar.gz src-5b5bbf2e7c341ec6ba569536fb14acb990d53334.zip | |
sctp: Remove now-unneeded mb_unmapped_to_ext() calls
sctp_delayed_checksum() now handles unmapped mbufs, thanks to m_apply().
No functional change intended.
Reviewed by: tuexen
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 756bb50b6a867f3309ce76d76f1842a667dd303a)
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/ip_divert.c | 6 | ||||
| -rw-r--r-- | sys/netinet/ip_output.c | 12 |
2 files changed, 0 insertions, 18 deletions
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index 4919893d6a61..936e216e0926 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -220,9 +220,6 @@ divert_packet(struct mbuf *m, bool incoming) } #if defined(SCTP) || defined(SCTP_SUPPORT) if (m->m_pkthdr.csum_flags & CSUM_SCTP) { - m = mb_unmapped_to_ext(m); - if (m == NULL) - return; sctp_delayed_cksum(m, (uint32_t)(ip->ip_hl << 2)); m->m_pkthdr.csum_flags &= ~CSUM_SCTP; } @@ -238,9 +235,6 @@ divert_packet(struct mbuf *m, bool incoming) } #if defined(SCTP) || defined(SCTP_SUPPORT) if (m->m_pkthdr.csum_flags & CSUM_SCTP_IPV6) { - m = mb_unmapped_to_ext(m); - if (m == NULL) - return; sctp_delayed_cksum(m, sizeof(struct ip6_hdr)); m->m_pkthdr.csum_flags &= ~CSUM_SCTP_IPV6; } diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index c269fca42015..4acec2bb877c 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -750,12 +750,6 @@ sendit: } #if defined(SCTP) || defined(SCTP_SUPPORT) if (m->m_pkthdr.csum_flags & CSUM_SCTP & ~ifp->if_hwassist) { - m = mb_unmapped_to_ext(m); - if (m == NULL) { - IPSTAT_INC(ips_odropped); - error = ENOBUFS; - goto bad; - } sctp_delayed_cksum(m, (uint32_t)(ip->ip_hl << 2)); m->m_pkthdr.csum_flags &= ~CSUM_SCTP; } @@ -908,12 +902,6 @@ ip_fragment(struct ip *ip, struct mbuf **m_frag, int mtu, } #if defined(SCTP) || defined(SCTP_SUPPORT) if (m0->m_pkthdr.csum_flags & CSUM_SCTP) { - m0 = mb_unmapped_to_ext(m0); - if (m0 == NULL) { - error = ENOBUFS; - IPSTAT_INC(ips_odropped); - goto done; - } sctp_delayed_cksum(m0, hlen); m0->m_pkthdr.csum_flags &= ~CSUM_SCTP; } |