git: fe6807287771 - stable/13 - mlx5en: idiomatic use of preprocessor, in particular paths
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 08 Feb 2022 06:55:52 UTC
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=fe68072877715664843590bdb540bca11f55124c
commit fe68072877715664843590bdb540bca11f55124c
Author: Konstantin Belousov <konstantinb@nvidia.com>
AuthorDate: 2021-06-14 10:43:44 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
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 <dev/mlx5/mlx5_en/en_rl.h>
+#include <dev/mlx5/mlx5_en/en_hw_tls.h>
#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 <dev/mlx5/mlx5_en/en.h>
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 <dev/mlx5/mlx5_en/en.h>
+#include <dev/mlx5/mlx5_en/port_buffer.h>
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 <dev/mlx5/mlx5_en/en.h>
#include <linux/list.h>
#include <dev/mlx5/fs.h>
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 <dev/mlx5/mlx5_en/en.h>
#include <dev/mlx5/tls.h>
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 <dev/mlx5/mlx5_en/en.h>
#include <sys/eventhandler.h>
#include <sys/sockio.h>
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 <dev/mlx5/mlx5_en/port_buffer.h>
#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 <dev/mlx5/mlx5_en/en.h>
#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 <dev/mlx5/mlx5_en/en.h>
#include <machine/in_cksum.h>
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 <dev/mlx5/mlx5_en/en.h>
#include <machine/atomic.h>
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 <dev/mlx5/mlx5_en/en.h>
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 <dev/mlx5/mlx5_en/en.h>
#include <dev/mlx5/port.h>
#define MLX5E_MAX_BUFFER 8