From nobody Fri Feb 7 15:33:59 2025 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 4YqJ0l3Hbnz5mMNV; Fri, 07 Feb 2025 15:33:59 +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 4YqJ0l2cchz3Vf6; Fri, 07 Feb 2025 15:33:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738942439; 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=icb5Lu1jRtXn2/hlGWPXEx64WG/jckNgFItS5auq2Rc=; b=fPa5wu4uifCB97MC1likIr0hxYrtQXOUIjx74mSLb5b5V1y5KUNfPnra3tBYGb49a7OvnX 32fNk0ANqLhWgeHliWhXgdhGY73h7Q6ll5ztVSpun8RqC1gGMaFrmNErSYDvnrLmvC8Yhd ybQ3JLkllHiBnVJQAl17JqOw1UVvPScn+SfbImt47RLZ9zcUrumhFIFhltgvZKyI0CU6ZP KcCEYSFt2KjeUkmxhrf35bNzUYMPcYiF6GaLl3LMsQ2wKrfYE5Zu4RQfSo5gP4rKY57feu aHaePdMaJUToR6gkbF7d5hqsrR9g2EcyKNOnSUsW1bZC32UJ9LQq71gM/IRViw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738942439; 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=icb5Lu1jRtXn2/hlGWPXEx64WG/jckNgFItS5auq2Rc=; b=n2L51cU+JU94bJyQ5hCqRze2qKOVY2oNGTNmQz7PbN01uRUqM6MZkmssHFAq8mVBhKc0RK k1qW/h+XIAnZQZdCffcCJghZZZafLoNtc/fccRmTghpD/8F0E/h7Brlje2LcQys8AvnjA4 z/rbFtP1yYs/0hgPiz/2xuUukfuGirdcLx8kHnOtLojhKTIKwtqxyvgv/f9XQef2YkwIQl vQZm8ebT0/MLPeQOjUjsSfRm+XV9aJK22Mh7nuDigVJKixwP3fN4fz3cC/7hgvQ5Oge+2G IG+cabU6To6qFBvGQ0Ru4VSnAPfBle5vF6QYuMtzK5483yaVwHeUOVPsjOOvmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738942439; a=rsa-sha256; cv=none; b=pPkbwXsalZW99+egCcZGvLzSKXOtfwEmdgXVAn0L87dMyfjzVrfPnWquDObk2QOuTlcex7 G5DvW9sOgExzRR3zYSETR0JCABUP7RbUhBrEX9GLyTsGi+QfE+XdZMRf/uLTpXw3as5Jhk B7cn0imercTajtqw72rBIW1duUMeLxP8ulgwfWU/MOd8AwpjVJxjKB2qdoLvp1SEkf0oy6 pjnI+dl+yIvwOeVnONOZ4upq0SVrIcU7Ad8tvCT2yOkLb2uhracinWb55smh08bYQDbu98 mwtwCG0f5tlj0kkfACbt5N2FRqmPw7cc2sfkqnTehiLF2Ib2mD12RsuOOSjBKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YqJ0l213kzVp3; Fri, 07 Feb 2025 15:33:59 +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 517FXxQn096259; Fri, 7 Feb 2025 15:33:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 517FXx9t096256; Fri, 7 Feb 2025 15:33:59 GMT (envelope-from git) Date: Fri, 7 Feb 2025 15:33:59 GMT Message-Id: <202502071533.517FXx9t096256@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Gallatin Subject: git: d942e2828cab - stable/14 - mlx5en: Fix SIOCSIFCAPNV 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d942e2828cab1d6999e199f53ac7682e5e0c3279 Auto-Submitted: auto-generated The branch stable/14 has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=d942e2828cab1d6999e199f53ac7682e5e0c3279 commit d942e2828cab1d6999e199f53ac7682e5e0c3279 Author: Andrew Gallatin AuthorDate: 2025-01-31 01:07:06 +0000 Commit: Andrew Gallatin CommitDate: 2025-02-07 15:31:40 +0000 mlx5en: Fix SIOCSIFCAPNV In 4cc5d081d8c23, a change was introduced that manipulated drv_ioctl_data->reqcap using IFCAP2 bits. This was noticed when creating a mixed lagg with mce0 and ixl0 caused the interfaces' txcsum caps to be disabled. Fixes: 4cc5d081d8c23 Reviewed by: glebius Sponsored by: Netflix MFC After: 7 days (cherry picked from commit 36fdc42c6a4c828d334471438c4f852e4b5a25e2) --- sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index 0e1de4d304a9..051669e7f85a 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -3542,7 +3542,7 @@ siocsifcap_driver: IFCAP_TXTLS6); } if (!mlx5e_is_tlsrx_capable(priv->mdev)) { - drv_ioctl_data->reqcap &= ~( + drv_ioctl_data->reqcap2 &= ~( IFCAP2_BIT(IFCAP2_RXTLS4) | IFCAP2_BIT(IFCAP2_RXTLS6)); }