From nobody Wed Apr 13 23:09:42 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 88DD61B40FFE; Wed, 13 Apr 2022 23:09:43 +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 4KdywR1yslz4m3D; Wed, 13 Apr 2022 23:09:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891383; 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=IhWyWK2APktryD+ddPKYq0bjspFTfTBn93WmAxTdrVQ=; b=JoJtrMwXSVUzyaqjJrGNOK7+Q/GfW7enyuYfc+KM1WAeWL7hd5iz24Uum4iXZLZBY93tn+ W2mnicNVP+7zq95XWPsf5wAJdHX7BPVZfZPWtduHvIT81XC15Ia4CZeQpw67B3s07Ze5IO 4tMoLa2McrwD6eNqqv9UJgefLx2fO2sXI+1sw/wN6FvQw2hukYSJs6BEz668OshOqQiCO8 l93Vqv0UKvV3Y4Vv80/xb8/LoZ74QDfcs4HYifMOKAftkIpkxAjdB+1veE0wDo0oubLXi1 iZGbPFzHbvoq5P0Tq+Q1DklNcnCadeUF+qRrf0RGKaXUhRsNhxOKMFV4Ca9ulQ== 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 0412015403; Wed, 13 Apr 2022 23:09:43 +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 23DN9ggs074739; Wed, 13 Apr 2022 23:09:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DN9gDE074738; Wed, 13 Apr 2022 23:09:42 GMT (envelope-from git) Date: Wed, 13 Apr 2022 23:09:42 GMT Message-Id: <202204132309.23DN9gDE074738@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: 4046178557e1 - main - ipsec_encap: setdf is only used for INET. 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: 4046178557e1e78ff830c2cfb17e10627ccecd37 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891383; 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=IhWyWK2APktryD+ddPKYq0bjspFTfTBn93WmAxTdrVQ=; b=v93CD/+v30r1Kbpg3DIYzFDP+ZII5j6+09BE/tVkvX7h8xTiM7s2G1nYkhpcMWr1RG8vgB Y/LTWamPH26f/mPKDFdwACUWSVUNYQJJRPzhXoO33IdqO4Xx2nX7eyDai4Hu4F1pzozaOJ UJH810p8JOgl3HzMjp0mTizVNDMuwO2PqvSWgGfizeLwAgeixuXEIMDDCBQYWYars/Srr6 3CYwbKUXMsrcS06SOM7caZ/y52UeUNFoG/OTA/L0Okze1UIPnSmt6WokubTk5UxfXrDuri Nq6YYYsnMJjx3bRvlJXUS9AnZDeGwZLP0V26RWQepP7NYIGETxBZRxwZLr7kfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649891383; a=rsa-sha256; cv=none; b=PZ1yIsAw8LI7fppa3CW88E6VN79/m5jPw0IQv7n21m3NaunPE5rZptQeWK6dCaCASJEv1R CqZPdGotUKwEclfnVbipb1Id/2XaVauz8PRHpuKuumr+CB973JXuzppcj/0YEYA4i88j0+ VK/vHn+CtczavwboNTpLpIqjv8zerGctbVnUdmBZ/w2Of+2qHmecT3Ifk47P6JCT/sl6Bw ymFx3TYMcl2exCEayrz5Yk/16D/900Es3JfXrj13YL18aM4JlKDfQvEoN/A77JwNySfW2U SCWer1a6LIXmyK/Bgj9PpVjn8noSMEf+8JPgwj4IR5dF7LCkn7/6ByWbe7Wwag== 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=4046178557e1e78ff830c2cfb17e10627ccecd37 commit 4046178557e1e78ff830c2cfb17e10627ccecd37 Author: John Baldwin AuthorDate: 2022-04-13 23:08:21 +0000 Commit: John Baldwin CommitDate: 2022-04-13 23:08:21 +0000 ipsec_encap: setdf is only used for INET. --- sys/netipsec/ipsec_output.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netipsec/ipsec_output.c b/sys/netipsec/ipsec_output.c index b0298f8145d4..26588db6371b 100644 --- a/sys/netipsec/ipsec_output.c +++ b/sys/netipsec/ipsec_output.c @@ -1082,7 +1082,9 @@ ipsec_encap(struct mbuf **mp, struct secasindex *saidx) struct ip6_hdr *ip6; #endif struct ip *ip; +#ifdef INET int setdf; +#endif uint8_t itos, proto; ip = mtod(*mp, struct ip *); @@ -1110,7 +1112,6 @@ ipsec_encap(struct mbuf **mp, struct secasindex *saidx) proto = IPPROTO_IPV6; ip6 = mtod(*mp, struct ip6_hdr *); itos = (ntohl(ip6->ip6_flow) >> 20) & 0xff; - setdf = V_ip4_ipsec_dfbit ? 1: 0; /* scoped address handling */ in6_clearscope(&ip6->ip6_src); in6_clearscope(&ip6->ip6_dst);