From nobody Tue Feb 08 06:55:51 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 7E37319B6E28; Tue, 8 Feb 2022 06:55:52 +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 4JtDLJ0qY1z4bPR; Tue, 8 Feb 2022 06:55:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644303352; 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=CShfznS3FaFF/1mGtmnlKosr2zeaWaCzJN/lJP0lv9U=; b=kJ9oEOWhVxD1yLRy2qiqCw+W0rAgQCzDodcKCsHNPuAUvoOQKtur1wLRZmEElKVoiRAzeQ cniK4rlgvaskBYZuWzhmHypOOyCzk8n0xtbP2bCHCmAMGqpJJc6jjYmO0+Wbm8w1jxkR0k IhiBNS+p4fQYRAITUBfCE66x5UTY1AR5A/9uWLQsaAz5a4gINAvGqobLYTR10jJC/Fixgs bK6siLIvfH8zCwpvKPFNJNoOWvDgyeRX7keApKO8/u5C/R11WfxCupO8vMYNVcR4OUJztz c3PHaktwh61gM4MMbS1MnfcabOOCz5363v1lRh6AgH0ssGQaMo55x24eiIcMiA== 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 C3AE014D2C; Tue, 8 Feb 2022 06:55:51 +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 2186tpoc053425; Tue, 8 Feb 2022 06:55:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2186tp5k053424; Tue, 8 Feb 2022 06:55:51 GMT (envelope-from git) Date: Tue, 8 Feb 2022 06:55:51 GMT Message-Id: <202202080655.2186tp5k053424@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: 6f8ed9c1250a - stable/13 - mlx5en: normalize use of the opt_*.h files 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: 6f8ed9c1250a03862544754a99795ce4254fbc72 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644303352; 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=CShfznS3FaFF/1mGtmnlKosr2zeaWaCzJN/lJP0lv9U=; b=ogo2F5SqTfqLDphmSfQLykMXbWEI3WjjY/OFoFTu0pfTZfsMqxwhFco7rKsuD18LZKixDu 9G69X+Qp7neBBHLquOanNFvbVV47SihaEvSwe7TU+ep55dUTkUQcIYktY5b+j2kFtGZdM2 7UqiEfWYxw2DrossQDVutPuqd3VCXFLmjdfvm+sgjNdgcYt7hgr1KLVRO2XWeX761SnhPe eMun9KXcB/LoWe3127sy/XvPexwrB80en+V1tJJo5nACfqFJq/HUEWyQvoSmlmFgySo+dJ BAchiPWxhBMi8xFoL6bLr26BOTh8160WUB8CYG+79vbnqhawRKuxaaR3ZqKcEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644303352; a=rsa-sha256; cv=none; b=wUoFpOBlaVd1LJhXIHJnyxU6TaQa85Xaf/N7vgMhx3IsKA3V9wYhIEip+i7ULWodfPj8qI 1ChUhb4FsnjcnSS4N+nJ/NNz4791ua/3rHz4Z5p55SiAkHOHu1sw2vjoGd76oedvaYgciC Ew78ZLDX0pp02Wa8BFc0Ahz6qRPezwvy0sn0fLGB/EPYrEPdCJmLvk+n3x6h3Sq5n/m1No 084riq45ZUgnBK+V+ghRxTD/Yo1kUTiuzK/2A5uQMbcfvc2yrftxKdOB9OpFnn18qE0FDE IVhxxr5ucFMpYBuTPpaM2s0Nauk2VbGyJrDG80JwJk51mi7e2CN0bCI1ifT9yw== 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=6f8ed9c1250a03862544754a99795ce4254fbc72 commit 6f8ed9c1250a03862544754a99795ce4254fbc72 Author: Konstantin Belousov AuthorDate: 2021-06-14 08:05:13 +0000 Commit: Konstantin Belousov 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 #include -#include "opt_rss.h" - #ifdef RSS #include #include 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 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 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 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 *