git: 6f8ed9c1250a - stable/13 - mlx5en: normalize use of the opt_*.h files

The branch stable/13 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=6f8ed9c1250a03862544754a99795ce4254fbc72

commit 6f8ed9c1250a03862544754a99795ce4254fbc72
Author:     Konstantin Belousov <konstantinb@nvidia.com>
AuthorDate: 2021-06-14 08:05:13 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2022-02-08 06:42:07 +0000

    mlx5en: normalize use of the opt_*.h files
    
    (cherry picked from commit b984b95693e0911836815addc95f18bb7ce28b04)
---
 sys/dev/mlx5/mlx5_en/en.h                  | 2 --
 sys/dev/mlx5/mlx5_en/mlx5_en_dim.c         | 3 +++
 sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c     | 3 +++
 sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c  | 3 +++
 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 | 3 +++
 sys/dev/mlx5/mlx5_en/mlx5_en_rl.c          | 3 +++
 sys/dev/mlx5/mlx5_en/mlx5_en_rx.c          | 3 +++
 sys/dev/mlx5/mlx5_en/mlx5_en_tx.c          | 2 ++
 sys/dev/mlx5/mlx5_en/mlx5_en_txrx.c        | 3 +++
 11 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/sys/dev/mlx5/mlx5_en/en.h b/sys/dev/mlx5/mlx5_en/en.h
index 8556a4364ddd..1706970b05a4 100644
--- a/sys/dev/mlx5/mlx5_en/en.h
+++ b/sys/dev/mlx5/mlx5_en/en.h
@@ -54,8 +54,6 @@
 #include <sys/kthread.h>
 #include <sys/counter.h>
 
-#include "opt_rss.h"
-
 #ifdef	RSS
 #include <net/rss_config.h>
 #include <netinet/in_rss.h>
diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_dim.c b/sys/dev/mlx5/mlx5_en/mlx5_en_dim.c
index cc7680e4013a..cb8ffe098095 100644
--- a/sys/dev/mlx5/mlx5_en/mlx5_en_dim.c
+++ b/sys/dev/mlx5/mlx5_en/mlx5_en_dim.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include "en.h"
 
 void
diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c b/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c
index 9b91ae27ffee..ab6392fa5fd6 100644
--- a/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c
+++ b/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include "en.h"
 #include "port_buffer.h"
 
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 54fbe8e057cc..5b139974c76f 100644
--- a/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c
+++ b/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include "en.h"
 
 #include <linux/list.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 1a92e5aa222a..46b5bb66908a 100644
--- a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c
+++ b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c
@@ -26,6 +26,8 @@
  */
 
 #include "opt_kern_tls.h"
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
 
 #include "en.h"
 
diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
index 12bd7e530762..47be3553d44f 100644
--- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
+++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
@@ -26,6 +26,8 @@
  */
 
 #include "opt_kern_tls.h"
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
 
 #include "en.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 f453b4759e27..4904802f3043 100644
--- a/sys/dev/mlx5/mlx5_en/mlx5_en_port_buffer.c
+++ b/sys/dev/mlx5/mlx5_en/mlx5_en_port_buffer.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include "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 fa7b812fbdf1..9197fdc2bc3f 100644
--- a/sys/dev/mlx5/mlx5_en/mlx5_en_rl.c
+++ b/sys/dev/mlx5/mlx5_en/mlx5_en_rl.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include "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 7cfd15b6aa5e..d4a175bf0988 100644
--- a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c
+++ b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include "en.h"
 #include <machine/in_cksum.h>
 
diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c b/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c
index e85522bdfad7..f09ee4f25412 100644
--- a/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c
+++ b/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c
@@ -26,6 +26,8 @@
  */
 
 #include "opt_kern_tls.h"
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
 
 #include "en.h"
 #include <machine/atomic.h>
diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_txrx.c b/sys/dev/mlx5/mlx5_en/mlx5_en_txrx.c
index 0befd107587c..c0f71c3fde86 100644
--- a/sys/dev/mlx5/mlx5_en/mlx5_en_txrx.c
+++ b/sys/dev/mlx5/mlx5_en/mlx5_en_txrx.c
@@ -25,6 +25,9 @@
  * $FreeBSD$
  */
 
+#include "opt_rss.h"
+#include "opt_ratelimit.h"
+
 #include "en.h"
 
 struct mlx5_cqe64 *