From nobody Wed Apr 13 23:10:09 2022 X-Original-To: dev-commits-src-main@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 2EFF91B42343; Wed, 13 Apr 2022 23:10:12 +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 4Kdywy33bYz4mLP; Wed, 13 Apr 2022 23:10:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891410; 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=Yw3IVmWUEsVUHvY+hdm/bCtaxr5Tuo/ZNwiHdl1gh1Y=; b=hCzj2ufXwLGl6kVWJ8M5kvR8HNp7Ol7S04IDOA8m34nld+ZwZukNENSi0ZA03LXN24ML1k zRJWRzE5EadwFBp3Db5d9OXyaFHqxr96yPOUi7t6Q702gemUSx2JHgGTZeS8a9ODsjmvaW 20bdo/tl/WKnip1dVqq08IKJkj8yWaAtPvS7ePbIP0BF6jLJzQefmvmuYz7IiVaPfO0FxS N/rhwoxGpI4MjVNGlnMvHBYO3TLYQ14+0GTIrwDhviTPtN4imTgGjwqYWYQBb+VCtJGznx iKB2QD+oqfr2/cp6gamai1mE0OrX+zlZOUg0/lfszDsr41EY02HW1bo8+PdxvA== 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 E06D215031; Wed, 13 Apr 2022 23:10:09 +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 23DNA92M078465; Wed, 13 Apr 2022 23:10:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DNA9FM078463; Wed, 13 Apr 2022 23:10:09 GMT (envelope-from git) Date: Wed, 13 Apr 2022 23:10:09 GMT Message-Id: <202204132310.23DNA9FM078463@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 39f7de587b7f - main - divert_packet: ip is only used for SCTP. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39f7de587b7f0c5d8e17134d2bfde111a07f2b8c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891410; 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=Yw3IVmWUEsVUHvY+hdm/bCtaxr5Tuo/ZNwiHdl1gh1Y=; b=YTvRRu3buCHNUB3SN+3CJz8vYyw1W7xZG6PHV/GpVNiO0lh+BkKL+LfzwgkUuI+8yaN9JL jww9FGJAsEggCRwaIXa7iDMQwNQXEZLEtUzm+birh7eG0jR/4PPlUDKgh5e6k3Dy9Scf5X rF4xt0KLMtm/nFo73lcYqPthZG7IP4G0jLeJ6Z5+jXXMly8waqdZ8la4K7g9wrkFDru6uC YWpvi9rZ6dZsSPNQzYNOz95uV8N2zVgGvxKrjlkp4mPvG965FbqoUAHpum+TmOrYnNvEWJ soavn7HQwqiPgAYpz/QhbWc0keWD2SCOeBbInb4CNMedmAr9pNSG6IiNBceTgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649891410; a=rsa-sha256; cv=none; b=JRQX6P+aDiH5IZNA6o9EB2zmAAo99LKaDypIMS+tWBr+6FnA5HlSDGZMeCPOsEh9t8wRLX HXReE4d6mh8d5mv9qOsZ4O44xupqYOYN39Ruwv4VsVQf3fh4C0eb8k3qk5kaDcgMWr4dcJ AWgjee2e9LjCkBdDxPtpXdhkFWgxhNz5vSvr+j0wvq0QcNrptqKJ9J01UjIveXhVoeNwo6 k9EGxleI77hoM+xnUj6T2f/0gD5iXnxcRoSw4AOsgxSu3JC2ue9pJBpMmRE/pF8R+JmTnh yg5ZUe7JjioHatjEr/254qOILzXVSd7InOQ8AwzgQVHMCc+6hq+5Iy40KYBD6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=39f7de587b7f0c5d8e17134d2bfde111a07f2b8c commit 39f7de587b7f0c5d8e17134d2bfde111a07f2b8c Author: John Baldwin AuthorDate: 2022-04-13 23:08:23 +0000 Commit: John Baldwin CommitDate: 2022-04-13 23:08:23 +0000 divert_packet: ip is only used for SCTP. --- sys/netinet/ip_divert.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index 6c4d85b03e6a..a745073d1ec0 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -178,7 +178,9 @@ div_port_match(const struct inpcb *inp, void *v) static void divert_packet(struct mbuf *m, bool incoming) { +#if defined(SCTP) || defined(SCTP_SUPPORT) struct ip *ip; +#endif struct inpcb *inp; struct socket *sa; u_int16_t nport; @@ -198,7 +200,6 @@ divert_packet(struct mbuf *m, bool incoming) if (m->m_len < sizeof(struct ip) && (m = m_pullup(m, sizeof(struct ip))) == NULL) return; - ip = mtod(m, struct ip *); /* Delayed checksums are currently not compatible with divert. */ if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA) { @@ -207,6 +208,7 @@ divert_packet(struct mbuf *m, bool incoming) } #if defined(SCTP) || defined(SCTP_SUPPORT) if (m->m_pkthdr.csum_flags & CSUM_SCTP) { + ip = mtod(m, struct ip *); sctp_delayed_cksum(m, (uint32_t)(ip->ip_hl << 2)); m->m_pkthdr.csum_flags &= ~CSUM_SCTP; }