From nobody Fri Jan 31 02:00:14 2025 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 4YkfH31X0Kz5mWNH; Fri, 31 Jan 2025 02:00:15 +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 4YkfH30rRNz47kb; Fri, 31 Jan 2025 02:00:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738288815; 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=8ovF3lKg82gMSFcM0Buuc+jSx019nB5F6epvWNzJlog=; b=N/QRvXH72LvYUktlmg1FX+JMP9424JUhpC+UZlIMCN7/ivGm7bzG3tl3CyOa+IgwOjWSpJ NSMIh/S3hdwRu9LDKqOw4p3LZOiuXhQAYgTaNuGV9qIONQ0wZpTJUQ7pa+3aAmMkWRSgkK Mgq8FMO0utFc/7ET8Pj7XKuBL+HdkEzYX9SnBT4dpEVJWY70QcTy2l//dfbyQIy6n7zylT fvSduWPVKKUqEcThKFILhMoPJT4trEEHIffyQ+WqagdXwcPS47DOIXKMRMiSUEvbvsPPbV CbioqxxIoKpGE1zeIIU1UHBfERV9JIswM/ZOeb6JMIqArEyYnyZisNOJ0x06WQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738288815; 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=8ovF3lKg82gMSFcM0Buuc+jSx019nB5F6epvWNzJlog=; b=Lc+LAubrgX3ob2Pk3LJ+SApulBS2vqxxxhx3200ooAfnBvGyd1HHwc57hvOyNU0MQjwR3C 1PI4dYgUYnXcFLQX9UXm3Vf0AMUGA+VGqkZ0UbDKYe2b5BjbIY3WKdh7IkUmb/cOC2QsZ8 movZqX/VDxM7Z5eft6AqyqfVo3439Aizs1od9zji5Q8ZDu34+ef5ihHYq1Bli+sGkqYip3 BQj1dIzWdPgLCxE8CZ5a4KpSIis40x+baD5eguvon8En4Jn/JXq4MLl6HHM5nekZ7rVYMr X1H8wZdOKyFjr8YTYErc/43H7GZTje8CtQ1EDHhvWb180lxiE1ttNAPaOQl/cQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738288815; a=rsa-sha256; cv=none; b=f/FAa3M47fLA3a+xeiD91c0acSZoOLjacccz+Hgmw09DiPAcwv9+bqqBfJp58OrmAou2Bo YHgNLRrstWHRGYc1T7ZJ9cF+fAbvVvfYy/PzkcJzS/cTd8IWzL+OSCMvwwU7xEEufRXc4D LtWbNltWS3XXP2D8ty79eyLNpUUNEw4AURrMuJU3KydBMEFLv+YxOi+UwL2d9CZz80EsMd CARxQWLmeTkzT4ugln9i/EWHQpO7eP+ZPtQCyQ3YOzCOZws9qNGPc8jxMM2fhSpzIsxi/L qxcqSg5mnih+GFt/hZspn+j0Tz0+XLGIOIy2zkXO029mrBKOigIyI59YdQEGbA== 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 4YkfH30G40z1CmT; Fri, 31 Jan 2025 02:00:15 +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 50V20EZW056714; Fri, 31 Jan 2025 02:00:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50V20Evk056708; Fri, 31 Jan 2025 02:00:14 GMT (envelope-from git) Date: Fri, 31 Jan 2025 02:00:14 GMT Message-Id: <202501310200.50V20Evk056708@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 36fdc42c6a4c - main - mlx5en: Fix SIOCSIFCAPNV 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: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36fdc42c6a4c828d334471438c4f852e4b5a25e2 Auto-Submitted: auto-generated The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=36fdc42c6a4c828d334471438c4f852e4b5a25e2 commit 36fdc42c6a4c828d334471438c4f852e4b5a25e2 Author: Andrew Gallatin AuthorDate: 2025-01-31 01:07:06 +0000 Commit: Andrew Gallatin 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)) {