From nobody Tue Feb 08 06:55:52 2022 X-Original-To: dev-commits-src-branches@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 CF17119B6E35; Tue, 8 Feb 2022 06:55:53 +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 4JtDLK2sxBz4bld; Tue, 8 Feb 2022 06:55:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644303353; 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=9/oaHjcPbSdSbV+ZRjO5h+VwP368C2PDEFi/V8R/71k=; b=XZbC2qGjAAt94q2ntdcw77ZQnfGJHVsHAAWHn2nnRN4eQFwG8rczHyFigWyIQ1Xu212rKP F4VJn/liAN59Fh3NrlTPtw6MBdskRSPOg2CkjROVZRPc28U2oAH4oDfRJ7rUtEqk6ld2er ykX8ofWJ9rWQivG4KANpj/4LGcSj5Cvv9yxaJGGy5nMeIFzIqpMLjasgavTMsLY7kBRlkG gh5bt6Ker45UqmLDEvbUMwuTFbnXVS6cuDH+bOihLoIENPvvoroC/tVAH12V+C0ac+ePu4 4kwcl+PVAgspdr/FZEth4bI3fODZJOoe6LdgSxpVYn/J9OALMbBpE43A16qmaw== 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 E707914F1F; Tue, 8 Feb 2022 06:55:52 +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 2186tqit053450; Tue, 8 Feb 2022 06:55:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2186tqp2053449; Tue, 8 Feb 2022 06:55:52 GMT (envelope-from git) Date: Tue, 8 Feb 2022 06:55:52 GMT Message-Id: <202202080655.2186tqp2053449@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: fe6807287771 - stable/13 - mlx5en: idiomatic use of preprocessor, in particular paths List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: fe68072877715664843590bdb540bca11f55124c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644303353; 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=9/oaHjcPbSdSbV+ZRjO5h+VwP368C2PDEFi/V8R/71k=; b=HKQfpMQlIFej4MekUDRCdgBLfbw9JULKV8843CJ43Eb5lwsSwo1+FL08CEW2Srsw3NDkD6 Uvqxpuewf/mR5LN6AIdtZOlPwrcibihYzatiQwC50/sFAJEySvD0PmEXOaMpUT2RpPjpUM +t4S8m5Nm4ARXpL3NwuS/Lv5UITuM1FTdZ1UyCBhgWJhZFZnLHO3/XlIFYzRIsoGkaei5I z0s9TZw4ptwMebO6XaX8I+w1PUeK5sg+o2yK/V6d71F5lG/Mw6N+Pe8lnZsoPlI87JFpaK tqabULXJYOyZrj5kCj7DA7AOU9UXWw1/9cb6qB/tmOnlNHm9kac3a3nkriVyPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644303353; a=rsa-sha256; cv=none; b=UNQrSiHMC8WRN4EeDj2y8CpUe7o8D8DWfvAFGLsZaKmTFKT0dRh2WwoalEVCrcalejGEtp xiWjd8UmPkU7zJ3l/+Apj1NYcmMHjUIvHVrLm7KUj9xxTfxXfN8vTnt8oWRjEfbWTAJni0 BnkDx6/XuD2Q3zUJSGTReQYChm7A6xuSChm9t4xS0gnqLeZIazX1QfBUiQ54e5wvCEdBAg SJZYwUIoba2yTxQIoTFvqOnUq3JKwDjBbDRll1jZi7w+pKpjQB2qla872sJdczeOszCO2s c2Gys832PrQzdyvba5G7FwnYahrReC51gPM7nYxKkdfVhsOUPSV124krjYSepw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fe68072877715664843590bdb540bca11f55124c commit fe68072877715664843590bdb540bca11f55124c Author: Konstantin Belousov AuthorDate: 2021-06-14 10:43:44 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-08 06:42:07 +0000 mlx5en: idiomatic use of preprocessor, in particular paths (cherry picked from commit 89918a2375cb27964d143aba6c40d22b41dbe520) --- 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 1706970b05a4..773f3f56026a 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 46b5bb66908a..8140100685e1 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 47be3553d44f..64d8752abad6 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 4904802f3043..9fa18f50b9c4 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 9197fdc2bc3f..a5c44dee5fad 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 f09ee4f25412..e2051896a003 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