git: 80be188a8160 - stable/12 - Fix the build after b3c1846830af71ee197dcfbdd9a6bea5980cbbdd
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 12 Nov 2021 12:59:33 UTC
The branch stable/12 has been updated by ae:
URL: https://cgit.FreeBSD.org/src/commit/?id=80be188a8160ba0f229823470df148a7089c5576
commit 80be188a8160ba0f229823470df148a7089c5576
Author: Andrey V. Elsukov <ae@FreeBSD.org>
AuthorDate: 2021-11-12 12:57:18 +0000
Commit: Andrey V. Elsukov <ae@FreeBSD.org>
CommitDate: 2021-11-12 12:57:18 +0000
Fix the build after b3c1846830af71ee197dcfbdd9a6bea5980cbbdd
stable/12 doesn't support unmapped mbufs, thus we don't need
to use mb_unmapped_to_ext().
This is direct commit to stable/12.
---
sys/netinet/ip_divert.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index 74ff93663c58..2aa4ba7bc05e 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -218,18 +218,12 @@ divert_packet(struct mbuf *m, int incoming)
#endif
#ifdef INET6
if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA_IPV6) {
- m = mb_unmapped_to_ext(m);
- if (m == NULL)
- return;
in6_delayed_cksum(m, m->m_pkthdr.len -
sizeof(struct ip6_hdr), sizeof(struct ip6_hdr));
m->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA_IPV6;
}
#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;
}