From owner-dev-commits-src-all@freebsd.org Mon Jul 26 15:19:22 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C44A266DAA7; Mon, 26 Jul 2021 15:19:22 +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 4GYNrB4kh4z3JbN; Mon, 26 Jul 2021 15:19:22 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 7C9AC190D4; Mon, 26 Jul 2021 15:19:22 +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 16QFJM7Q025276; Mon, 26 Jul 2021 15:19:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16QFJMPn025275; Mon, 26 Jul 2021 15:19:22 GMT (envelope-from git) Date: Mon, 26 Jul 2021 15:19:22 GMT Message-Id: <202107261519.16QFJMPn025275@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5955e8b93ece - stable/13 - mlx5: cqe64: update the tunneled bit name with recent PRM 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 5955e8b93ece64cb1f95d9c037c209eacfc77e10 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Jul 2021 15:19:22 -0000 The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5955e8b93ece64cb1f95d9c037c209eacfc77e10 commit 5955e8b93ece64cb1f95d9c037c209eacfc77e10 Author: Konstantin Belousov AuthorDate: 2021-04-06 03:23:22 +0000 Commit: Konstantin Belousov CommitDate: 2021-07-26 13:51:09 +0000 mlx5: cqe64: update the tunneled bit name with recent PRM (cherry picked from commit c8bdc78be19da5443c9186fa2fdb6e9427795565) --- sys/dev/mlx5/device.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/dev/mlx5/device.h b/sys/dev/mlx5/device.h index 69057d5f2470..64d4ed87d58f 100644 --- a/sys/dev/mlx5/device.h +++ b/sys/dev/mlx5/device.h @@ -662,8 +662,9 @@ struct mlx5_err_cqe { }; struct mlx5_cqe64 { - u8 tunneled_etc; - u8 rsvd0[3]; + u8 tls_outer_l3_tunneled; + u8 rsvd0; + __be16 wqe_id; u8 lro_tcppsh_abort_dupack; u8 lro_min_ttl; __be16 lro_tcp_win; @@ -724,7 +725,7 @@ static inline bool cqe_has_vlan(struct mlx5_cqe64 *cqe) static inline bool cqe_is_tunneled(struct mlx5_cqe64 *cqe) { - return cqe->tunneled_etc & 0x1; + return cqe->tls_outer_l3_tunneled & 0x1; } enum {