From nobody Wed Sep 07 03:55:36 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MMpLw321yz4bQH5; Wed, 7 Sep 2022 03:55:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MMpLw1rMMz3S4q; Wed, 7 Sep 2022 03:55:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662522936; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wyM8yMO/z7OdIz/XtviYrQqrZ03zEGxyE5U/f4b8Vac=; b=e+mHMJB8au1875AnonoO4wTprzCwC96s172cRi6PXXm7RCegOI83wK85LShPJaPz7g4KLw ZpPTnRpkB7NKAbJ74Q0lPl0PwQpZGjJefoqn55CmdVVqgKNHidvVBE00cP0y9QCUQjt0Zp re522+nnVMCfSvPxnNoqq2pA/R/xMLp7I+Ii8vAW9doAR6T3ETWGCerjym9cElLSBQUzUt tJ6SLNbml9NrO9t93uT1o6Z9Y0riuHHnE5k19C9V1zn1r+MpMt3mBgbJPETRRtQdvvPjDt c/tQH2s80emBjpbVW9mP4mgV+KGLpfyKrPKkWOlnhSp6DAS5kBOfHQtBH1gqfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MMpLw0tHpzPPM; Wed, 7 Sep 2022 03:55:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2873taGN069876; Wed, 7 Sep 2022 03:55:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2873taoK069875; Wed, 7 Sep 2022 03:55:36 GMT (envelope-from git) Date: Wed, 7 Sep 2022 03:55:36 GMT Message-Id: <202209070355.2873taoK069875@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 999c9fd7339d - main - divert(4): don't check for CSUM_SCTP without INET List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 999c9fd7339d59196b538049db0953d3010cb142 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662522936; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wyM8yMO/z7OdIz/XtviYrQqrZ03zEGxyE5U/f4b8Vac=; b=ZJ52JG43tb/h7vJ9pAQzfXJWppQmPFpPr+kDH+iIAqbd3pdEfi7C/j/JXCEeDfBckGw4P9 IbiO7TJm57pudhRHXrcRHZLiyH8XPCfqQ2vTaf4aKFDADC2q/io9uSUOqagwJYF6x0cX// BU6676CvYJT6LNzbf4CXKXiERaNdkUBsU93NgD6tqMlVquzeLs6z9yT06PSSRWXK1hZgzL vEN9Bx4qJTv7gZiMDnnDhQJUzkY5wU1/BdozCKW5DK8LJK8YThO5WDIwseh4i7hZx5VNzG ryHESd68dw4XgZ1LLwJe+FMv6q2vF0HANADG4DhzAh5Z4tuxT6dCtVZTEF1GZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662522936; a=rsa-sha256; cv=none; b=RyW77S09dlrEjf6s2uvXnefCWenfDesENHgxycpRhPCAUmIlP1gpSTQB9Kc0hrbGnx1+Rw Q2qF7ApF3RzmyxJaRYmM/z349DEgKwazU0tersAZ+Xa5Xz3ZWSUQ4lwuPyBFN1LwSOO/5Q XM/NLt9NDGrYxbNbMgkHfT1wsSkiGDMjT9PzzBR1jEH8rCtGHZJXgOgP1AYdueZCAE8Fca Bn6z5rV9g9ISD1oSkR6emX1m/T276m1IrB9kop610BFfXmxmHmvcpXR4BS9H2eAuH/ule9 T99LuxJcU2m4j/P644QwhlOfK53FFQgAW/dH03ZG+Tu/Tb5cUMx05NG9hAoKNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=999c9fd7339d59196b538049db0953d3010cb142 commit 999c9fd7339d59196b538049db0953d3010cb142 Author: Gleb Smirnoff AuthorDate: 2022-09-07 03:54:57 +0000 Commit: Gleb Smirnoff 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 -