Date: Thu, 20 Mar 2025 03:14:08 GMT From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: ec551188213e - stable/14 - mlx5: correct the predicate asserted in __predict_true() Message-ID: <202503200314.52K3E8Pm086363@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ec551188213e7c5c52abb7d4c06d46540ef1d840 commit ec551188213e7c5c52abb7d4c06d46540ef1d840 Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2025-02-09 10:25:05 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2025-03-20 03:13:38 +0000 mlx5: correct the predicate asserted in __predict_true() (cherry picked from commit 903996760d1903a7bb594b7f2ed8072e9e6cef9f) --- sys/dev/mlx5/mlx5_en/mlx5_en_rx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c index 0a1cd2bc4aee..d82718ed3bb5 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c @@ -206,9 +206,9 @@ mlx5e_lro_update_hdr(struct mbuf *mb, struct mlx5_cqe64 *cqe) * +--------+--------+--------+--------+ */ if (get_cqe_lro_timestamp_valid(cqe) && - (__predict_true(*ts_ptr) == ntohl(TCPOPT_NOP << 24 | + (__predict_true(*ts_ptr == ntohl(TCPOPT_NOP << 24 | TCPOPT_NOP << 16 | TCPOPT_TIMESTAMP << 8 | - TCPOLEN_TIMESTAMP))) { + TCPOLEN_TIMESTAMP)))) { /* * cqe->timestamp is 64bit long. * [0-31] - timestamp.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202503200314.52K3E8Pm086363>