From nobody Tue Feb 01 14:46:19 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 9A02919A5E86; Tue, 1 Feb 2022 14:46: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 4Jp76N1jhXz4hxj; Tue, 1 Feb 2022 14:46:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643726780; 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=Ra2+nZTJeZlTkMCFlOJfSaQMwuUKdB3+5T+H5r9yCJA=; b=hJlBhzXvBxAowzJAb5xUId0+d7psowWoAKqfg2SoMAgO0Bam2vIdinfQSpo9uSiCkMue6D HABTvx6OPp5X7j6BIstNgnAEJbLFh77fMxDJo3I5R/s9CvutXTKym0j/1WyFcoA2GKbyZt 3cMY3nb496tkR/4u5k5dK6hqRP/GSudeBfvIJGRllPB0inGbPRpnWkfbNGviTd2EhBSlsu gHJk6aJn1XE1ul8UHDylo4SR5LxlgD2ekKB1aAolMdSedgsS6DKyJado6CyRButv7Gf2Uy rJVf5Uo+YseuQ72C8NpbNurK67KpAPzv+gFev3joNMC2MApRorB1ORPwNQWCug== 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 E8F2312D81; Tue, 1 Feb 2022 14:46:19 +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 211EkJIU096733; Tue, 1 Feb 2022 14:46:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 211EkJPe096732; Tue, 1 Feb 2022 14:46:19 GMT (envelope-from git) Date: Tue, 1 Feb 2022 14:46:19 GMT Message-Id: <202202011446.211EkJPe096732@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 89918a2375cb - main - mlx5en: idiomatic use of preprocessor, in particular paths 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89918a2375cb27964d143aba6c40d22b41dbe520 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643726780; 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=Ra2+nZTJeZlTkMCFlOJfSaQMwuUKdB3+5T+H5r9yCJA=; b=drUZb5DhiUOIzT9c59SUixeTypxHB/hFihFUJeQ8oNGnWSbrp3nZHELEX62lMPTkiTSypv 3km8kcE+yMhO669iwrm8wkB1Vd07+7tzKzNczrOTthg3sbqfIZClybpSEbBwpVOzPIP+7V eFkgRLcm59dVI0wrrvTesD13rC/h2BRQVgr45RVLShaPt5vGAWNY9lLA0wHf7gTPhuzmn5 Zgnl056BvVZGxzPFPpjzrPzamTVbLBEB664dKgOVCGNPysyB4KjdkY6k8uimoL7qNvKj9t i4lP+5iR9jt3sYB/fNp78Yr7Lta+nch07OSz0as1kO2u6wHWByLvXZjH5nXQfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643726780; a=rsa-sha256; cv=none; b=si3zYENYXCyzvZER6P7SlvTNhXHlygnX9xUKquw7i5GTo4lveFAlfdO3DlQoIEJ4BEkJky FerQt45NeXjs14J4EDCBNexHFe6MbDG8+Ia6to3BspTq8v3HaqUeQyTVhLEIDYWKyo+NH0 /EhsR9SuerKWYfbgqp1uNM904PcgEMqVx7C9piMl6WZgbyH2azuGVY9YLAnfl4z/rPkLpj aLgiZ4oqpUlL3v+wwazNVqSGNt401k34dJtiQRj1BNbme9ddm+RNR7xfi7/5wlpF/OsJK8 RfLZeKC6JjTL46xuruojpWntn09kFltFaLpyjbd2SYGAmn64vl+Kkzsf0xvfNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=89918a2375cb27964d143aba6c40d22b41dbe520 commit 89918a2375cb27964d143aba6c40d22b41dbe520 Author: Konstantin Belousov AuthorDate: 2021-06-14 10:43:44 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-01 12:45:57 +0000 mlx5en: idiomatic use of preprocessor, in particular paths MFC after: 1 week Sponsored by: NVIDIA Networking --- sys/dev/mlx5/mlx5_en/en.h | 4 ++-- sys/dev/mlx5/mlx5_en/mlx5_en_dim.c | 2 +- sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c | 4 ++-- sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c | 2 +- sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c | 2 +- sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 2 +- sys/dev/mlx5/mlx5_en/mlx5_en_port_buffer.c | 2 +- sys/dev/mlx5/mlx5_en/mlx5_en_rl.c | 2 +- sys/dev/mlx5/mlx5_en/mlx5_en_rx.c | 2 +- sys/dev/mlx5/mlx5_en/mlx5_en_tx.c | 2 +- sys/dev/mlx5/mlx5_en/mlx5_en_txrx.c | 2 +- sys/dev/mlx5/mlx5_en/port_buffer.h | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/en.h b/sys/dev/mlx5/mlx5_en/en.h index 26d92827406c..af6cd8371506 100644 --- a/sys/dev/mlx5/mlx5_en/en.h +++ b/sys/dev/mlx5/mlx5_en/en.h @@ -982,8 +982,8 @@ struct mlx5e_xmit_args { u16 ihs; }; -#include "en_rl.h" -#include "en_hw_tls.h" +#include +#include #define MLX5E_TSTMP_PREC 10 diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_dim.c b/sys/dev/mlx5/mlx5_en/mlx5_en_dim.c index cb8ffe098095..57ca04848bd2 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_dim.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_dim.c @@ -28,7 +28,7 @@ #include "opt_rss.h" #include "opt_ratelimit.h" -#include "en.h" +#include void mlx5e_dim_build_cq_param(struct mlx5e_priv *priv, diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c b/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c index ab6392fa5fd6..11f47e3f8aa3 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c @@ -28,8 +28,8 @@ #include "opt_rss.h" #include "opt_ratelimit.h" -#include "en.h" -#include "port_buffer.h" +#include +#include void mlx5e_create_stats(struct sysctl_ctx_list *ctx, diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c b/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c index 5b139974c76f..da4b1cbb676d 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c @@ -28,7 +28,7 @@ #include "opt_rss.h" #include "opt_ratelimit.h" -#include "en.h" +#include #include #include diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c index d269b7fae64b..059703b28ce4 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c @@ -29,7 +29,7 @@ #include "opt_rss.h" #include "opt_ratelimit.h" -#include "en.h" +#include #include diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index 92aae3180b5e..e8d9d26efc6f 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -29,7 +29,7 @@ #include "opt_rss.h" #include "opt_ratelimit.h" -#include "en.h" +#include #include #include diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_port_buffer.c b/sys/dev/mlx5/mlx5_en/mlx5_en_port_buffer.c index 6c7ae5a297cc..078e31cf1949 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_port_buffer.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_port_buffer.c @@ -28,7 +28,7 @@ #include "opt_rss.h" #include "opt_ratelimit.h" -#include "port_buffer.h" +#include #define MLX5E_MAX_PORT_MTU 9216 diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_rl.c b/sys/dev/mlx5/mlx5_en/mlx5_en_rl.c index ede6b5019cff..09a894608e6d 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_rl.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_rl.c @@ -28,7 +28,7 @@ #include "opt_rss.h" #include "opt_ratelimit.h" -#include "en.h" +#include #ifdef RATELIMIT diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c index d4a175bf0988..e943a65709cf 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c @@ -28,7 +28,7 @@ #include "opt_rss.h" #include "opt_ratelimit.h" -#include "en.h" +#include #include static inline int diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c b/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c index 69b7d904f36f..7bb12d7b5b8a 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c @@ -29,7 +29,7 @@ #include "opt_rss.h" #include "opt_ratelimit.h" -#include "en.h" +#include #include static inline bool diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_txrx.c b/sys/dev/mlx5/mlx5_en/mlx5_en_txrx.c index c0f71c3fde86..9f5e17ad864e 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_txrx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_txrx.c @@ -28,7 +28,7 @@ #include "opt_rss.h" #include "opt_ratelimit.h" -#include "en.h" +#include struct mlx5_cqe64 * mlx5e_get_cqe(struct mlx5e_cq *cq) diff --git a/sys/dev/mlx5/mlx5_en/port_buffer.h b/sys/dev/mlx5/mlx5_en/port_buffer.h index d16347f31a62..d5e2b1c9bd35 100644 --- a/sys/dev/mlx5/mlx5_en/port_buffer.h +++ b/sys/dev/mlx5/mlx5_en/port_buffer.h @@ -28,7 +28,7 @@ #ifndef __MLX5_EN_PORT_BUFFER_H__ #define __MLX5_EN_PORT_BUFFER_H__ -#include "en.h" +#include #include #define MLX5E_MAX_BUFFER 8