Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 31 Jan 2025 02:00:14 GMT
From:      Andrew Gallatin <gallatin@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 36fdc42c6a4c - main - mlx5en: Fix SIOCSIFCAPNV
Message-ID:  <202501310200.50V20Evk056708@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by gallatin:

URL: https://cgit.FreeBSD.org/src/commit/?id=36fdc42c6a4c828d334471438c4f852e4b5a25e2

commit 36fdc42c6a4c828d334471438c4f852e4b5a25e2
Author:     Andrew Gallatin <gallatin@FreeBSD.org>
AuthorDate: 2025-01-31 01:07:06 +0000
Commit:     Andrew Gallatin <gallatin@FreeBSD.org>
CommitDate: 2025-01-31 01:57:35 +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
---
 sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
index 3e7df834d080..c17da50c1a5e 100644
--- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
+++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
@@ -3557,12 +3557,12 @@ 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));
 		}
 		if (!mlx5e_is_ipsec_capable(priv->mdev)) {
-			drv_ioctl_data->reqcap &=
+			drv_ioctl_data->reqcap2 &=
 			    ~IFCAP2_BIT(IFCAP2_IPSEC_OFFLOAD);
 		}
 		if (!mlx5e_is_ratelimit_capable(priv->mdev)) {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501310200.50V20Evk056708>