From nobody Wed Jun 8 11:54:56 2022 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 330988356C6; Wed, 8 Jun 2022 11:54:57 +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 4LJ5J10vBLz3PYm; Wed, 8 Jun 2022 11:54:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654689297; 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=6iOIcGD0TxjQdjEbuO98QhusPxZMtc50GSSuLdR3uqM=; b=TWdXJG2u+G3UQVxpzIp+sMUEy+XU7yD211EvWQ2xIuOsf9vvQhXHqjNMxLGipvZCHahNcB BC0CbCrEdyMNFkFGaP6J1EvoZZv1F6i9VfIVHCh5DYTSe7LhbOLNnSem34k4DN+Xhrtb/K yfSq+MLDlRMSGDHR2xidnVBRWxrRGsYVcjWu1Lvnjwm9bN4RoWxoIT2UPi5awdR6imgYpp QsSW6/RIRsGEGWOislY6AEtqL1ifqprMd7UxddhEmx9PVucmzOlp2/DDVrQvm3jaIzd6I/ 8KmL/YtDmTG6t9/aOQqYH15M+UPEsf3nULuKcL4h11f/TE1ZrTV93wBkm0QfDg== 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 F2D05733D; Wed, 8 Jun 2022 11:54:56 +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 258Bsuff068748; Wed, 8 Jun 2022 11:54:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 258Bsu1m068747; Wed, 8 Jun 2022 11:54:56 GMT (envelope-from git) Date: Wed, 8 Jun 2022 11:54:56 GMT Message-Id: <202206081154.258Bsu1m068747@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hans Petter Selasky Subject: git: d5d6949031cc - main - mlx5en(4): Allow RX TLS to be enabled and disabled by ifconfig(8). 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5d6949031ccf19318b03d479605d54c55762453 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654689297; 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=6iOIcGD0TxjQdjEbuO98QhusPxZMtc50GSSuLdR3uqM=; b=FdA+ZWqAM1kVJjlOaARUJG5pxvwN4Ekqo7UOpa3jRXNEUyrnE49sh1YBPaw0j9apl++j1g ohl+HGoHc3G9b15MuwUV24DudG6HJ8V98DHGl02PQq2qTY91VpDr3bsAkDdi/LlHQ1U0yB Kr44eyX+DhQmk775536+MGf0sAIfJmcfxt6ApAjaXPQBPVFYgQy4CkXhjyoTsIRW7RII7r /D5ljOGFsrrhnkDAFxJ/+2blS1WNge42wqvJEEb2EpSRYGd59NDhBBauTGd5uGrztb6ZPM ScBZ+4dbTydOgn51APcAWuFA7WKXSekc9bD7U6riVpyz3steJSVbnWXzusB5IQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654689297; a=rsa-sha256; cv=none; b=Wczis9FXgcvTnlmxz7QkKvXPKZd4ZQD9a5ArW1e/5CZH/ktyXC+vLo9uw8zPoWrmqUcJW7 or8CX+eeR2zllvIP6t2DtmXmvSojVI5bvtIL2pdVB5LUH5lgpWs+G25S2BLQCU82F5N0OQ TiA15sF4DcksnaU2zus0S3LpR2ZqcXsjdHPRtDGAb7p1LgWNSMLntOFMH6WKT+oUm8/Oiw gI6vScVByvE2faj+wQwFvpBMZ85wSmDBAh+nKkfs49/Uh9MDB22liBygTop6E+BrNxZOKi MFKMap0WCuHvrhNq/v+EF8VI0VOSB5kGiqY642Y6MfvPJaoL5pOtSyJUbtkDTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=d5d6949031ccf19318b03d479605d54c55762453 commit d5d6949031ccf19318b03d479605d54c55762453 Author: Hans Petter Selasky AuthorDate: 2022-06-08 11:22:32 +0000 Commit: Hans Petter Selasky CommitDate: 2022-06-08 11:53:26 +0000 mlx5en(4): Allow RX TLS to be enabled and disabled by ifconfig(8). While at it, fix double initialization of the "drv_ioctl_data_d" structure and the "mask" variable. Reviewed by: kib@ MFC after: 1 week Sponsored by: NVIDIA Networking --- sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index 075c677f32e1..0cae0696a180 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -3434,9 +3434,9 @@ mlx5e_ioctl(struct ifnet *ifp, u_long command, caddr_t data) struct ifi2creq i2c; struct ifrsskey *ifrk; struct ifrsshash *ifrh; - struct siocsifcapnv_driver_data *drv_ioctl_data, drv_ioctl_data_d = {}; + struct siocsifcapnv_driver_data *drv_ioctl_data, drv_ioctl_data_d; int error = 0; - int mask = 0; + int mask; int size_read = 0; int module_status; int module_num; @@ -3521,7 +3521,7 @@ mlx5e_ioctl(struct ifnet *ifp, u_long command, caddr_t data) drv_ioctl_data = &drv_ioctl_data_d; drv_ioctl_data->reqcap = ifr->ifr_reqcap; PRIV_LOCK(priv); - drv_ioctl_data->reqcap2 = ifp->if_capabilities2; + drv_ioctl_data->reqcap2 = ifp->if_capenable2; drv_ioctl_data->nvcap = NULL; goto siocsifcap_driver; case SIOCSIFCAPNV: @@ -3663,6 +3663,11 @@ siocsifcap_driver: priv->clbr_done = 0; } } + mask = drv_ioctl_data->reqcap2 ^ ifp->if_capenable2; + if (mask & IFCAP2_RXTLS4) + ifp->if_capenable2 ^= IFCAP2_RXTLS4; + if (mask & IFCAP2_RXTLS6) + ifp->if_capenable2 ^= IFCAP2_RXTLS6; out: PRIV_UNLOCK(priv); break;