Date: Wed, 7 Sep 2022 03:55:36 GMT From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 999c9fd7339d - main - divert(4): don't check for CSUM_SCTP without INET Message-ID: <202209070355.2873taoK069875@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=999c9fd7339d59196b538049db0953d3010cb142 commit 999c9fd7339d59196b538049db0953d3010cb142 Author: Gleb Smirnoff <glebius@FreeBSD.org> AuthorDate: 2022-09-07 03:54:57 +0000 Commit: Gleb Smirnoff <glebius@FreeBSD.org> CommitDate: 2022-09-07 03:54:57 +0000 divert(4): don't check for CSUM_SCTP without INET This compiles, but actually is a dead code. Noticed by: bz Fixes: e72c522858cb --- sys/netinet/ip_divert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index 2a5a7677cb71..aa0ffdb55530 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -190,7 +190,6 @@ divert_packet(struct mbuf *m, bool incoming) in_delayed_cksum(m); m->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA; } -#endif #if defined(SCTP) || defined(SCTP_SUPPORT) if (m->m_pkthdr.csum_flags & CSUM_SCTP) { struct ip *ip; @@ -200,6 +199,7 @@ divert_packet(struct mbuf *m, bool incoming) m->m_pkthdr.csum_flags &= ~CSUM_SCTP; } #endif +#endif #ifdef INET6 if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA_IPV6) { in6_delayed_cksum(m, m->m_pkthdr.len -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202209070355.2873taoK069875>