From nobody Wed Aug 21 10:32:08 2024 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 4WpjLw2kclz5TdlH; Wed, 21 Aug 2024 10:32:08 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WpjLw20S2z4npc; Wed, 21 Aug 2024 10:32:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724236328; 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=JOGeJfKy9Jfs90TZ9gqCuMfXSoLOImAHiBH+bEepYIA=; b=RMfT2ULdyRTVQNC/wOES0TywXMzBeYEKbA1rosDdly3ZgacD3bsvUDhf0b281LiaaYve/C h/xa2F2EF1J6WkWODEd/OVAJRnXbYK4IvpY3spd+bssYvkEYALmxSAMiLkDV3wMO2BIcDK jIwPqGvdjlhx65c++zbZrZ6aqTeA9kKMGSdAj7tMbA/qkpuk73WnhSCu0ayZ6gxtQ1Hiqv RD6Rt9OcrxUFTEpzag9Q1yx5xbxnSJ4246Fq+gLGbcvD/vhYPD0cgtk1fZ8XJcOSuUkYwk J+BXfNriMcvesfGkODNloluZeDHyvQtXVqHGIDR1HVRX4BQkfqRDyKXIe4BWzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724236328; a=rsa-sha256; cv=none; b=YPr79kDSgXwyXDklP+1Dd5bYJ/NIJhFkDkBe/wDE1Ol+TtQjSr1jen5Y82OAVfe6kWTVfn dhttoU9/KCJVGf0khcrsNu8+dvMoG8fkYm/hiBWDyqVpVvE3C6q+zNw7b3u5Wl/Qr0VmFl WyAgXI1Mqv29lJnDxsf99zr7bNZuDbeF3YCHqc8xW9pZ1YJ0NSZ9g+4Z92lwZ8NVCgj9EJ 2JjTRLlveB5zsIb3CAb/0DINAWdu9XF0sDnIVjJByKvdeRWFsHRvVgWgS2U7gvczK2gNxO 2+s2wdH4ieBzw/Mkwi7wmF0xah4DtgrMdifLan6n5/ijicYWZtTZ0zEK1XUu5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724236328; 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=JOGeJfKy9Jfs90TZ9gqCuMfXSoLOImAHiBH+bEepYIA=; b=uQ8sO5LqxDB10428EOUv8FEWx627omOpZA90h8kSNV9srwzOummuqrzoquoyqC07mtJBCQ CUdu5mr+8pKSdsg5++3hBsIIy+L62pGdScn7j3F7dpgIs7UErXLy9sKFkxGqDJRPwXTUAW vr9YQxRD3z3ebZgwtU2moNJ55nwJR124E/khPo0qb3JTAd90zKd5noL+Sm82ejtBVhzWEh QJ+kL3Ol8mQDFVlDDafRqQJHf3vujyIar1M6daSHMBhNbacu1Nw5tbFYRC0OFZDhM8nnkN x5aiKWUMZnARbeJ4mK5vJMo8hsXoiXYZ7SH2CJjvXuEhcSdKuc0nIA8HYm35qg== 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 4WpjLw1RG7zgX6; Wed, 21 Aug 2024 10:32:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47LAW85p077144; Wed, 21 Aug 2024 10:32:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47LAW8Yg077141; Wed, 21 Aug 2024 10:32:08 GMT (envelope-from git) Date: Wed, 21 Aug 2024 10:32:08 GMT Message-Id: <202408211032.47LAW8Yg077141@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 828445cc5e18 - main - if_vlan: set if_cap{abilities2,enable2} after IFCAP_IPSEC_OFFLOAD is recalculated 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 828445cc5e18b678ff032325a8dadc59b9bfbea6 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=828445cc5e18b678ff032325a8dadc59b9bfbea6 commit 828445cc5e18b678ff032325a8dadc59b9bfbea6 Author: Konstantin Belousov AuthorDate: 2024-08-20 22:20:49 +0000 Commit: Konstantin Belousov CommitDate: 2024-08-21 10:31:41 +0000 if_vlan: set if_cap{abilities2,enable2} after IFCAP_IPSEC_OFFLOAD is recalculated This makes the vlan IPSEC offload really functional. Noted by: Ariel Ehrenberg Sponsored by: NVidia networking --- sys/net/if_vlan.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 45489138fdef..a30db9173383 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -2210,8 +2210,6 @@ vlan_capabilities(struct ifvlan *ifv) ifp->if_capabilities = cap; ifp->if_capenable = ena; - ifp->if_capabilities2 = cap2; - ifp->if_capenable2 = ena2; ifp->if_hwassist = hwa; #ifdef IPSEC_OFFLOAD @@ -2219,6 +2217,9 @@ vlan_capabilities(struct ifvlan *ifv) ena2 |= mena2 & IFCAP2_BIT(IFCAP2_IPSEC_OFFLOAD); ifp->if_ipsec_accel_m = &vlan_if_ipsec_accel_methods; #endif + + ifp->if_capabilities2 = cap2; + ifp->if_capenable2 = ena2; } static void