From: Arnd Bergmann <arnd@arndb.de>
To: Matan Barak <matanb@mellanox.com>,
Leon Romanovsky <leonro@mellanox.com>,
Saeed Mahameed <saeedm@mellanox.com>
Cc: netdev@vger.kernel.org, linux-rdma@vger.kernel.org,
linux-kernel@vger.kernel.org, arnd@arndb.de, davem@davemloft.net,
Matthew Finlay <matt@mellanox.com>,
Richard Cochran <richardcochran@gmail.com>,
Amir Vadai <amirv@mellanox.com>,
Haggai Abramonvsky <hagaya@mellanox.com>,
Maor Gottlieb <maorg@mellanox.com>,
Or Gerlitz <ogerlitz@mellanox.com>,
Majd Dibbiny <majd@mellanox.com>
Subject: [PATCH 3/3] net/mlx5e: don't build RFS without ethernet
Date: Wed, 4 May 2016 14:32:24 +0200 [thread overview]
Message-ID: <1462365155-3861405-1-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1462364774-3792510-1-git-send-email-arnd@arndb.de>
The RFS acceleration support in mlx5 is enabled whenever CONFIG_RFS_ACCEL
is in use. However, this fails if a user turns off CONFIG_MLX5_CORE_EN,
because the rfs code now calls into the ethernet portion of the
driver:
ERROR: "mlx5e_destroy_flow_table" [drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko] undefined!
This patch adds another Kconfig symbol to control the compilation of
the RFS code, to ensure it is only built if both the ethernet support
and the core RFS support are enabled.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 4 ++++
drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
index f5c3b9465d8d..5efba14a1453 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
+++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
@@ -38,3 +38,7 @@ config MLX5_CORE_EN_VXLAN
depends on MLX5_CORE_EN && VXLAN && !(MLX5_CORE=y && VXLAN=m)
---help---
Say Y here if you want to use VXLAN offloads in the driver.
+
+config MLX5_CORE_EN_RFS
+ def_bool y
+ depends on MLX5_CORE_EN && RFS_ACCEL
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/Makefile
index 6b8da0b36acd..29118c1debb7 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/Makefile
+++ b/drivers/net/ethernet/mellanox/mlx5/core/Makefile
@@ -11,4 +11,4 @@ mlx5_core-$(CONFIG_MLX5_CORE_EN) += wq.o eswitch.o \
mlx5_core-$(CONFIG_MLX5_CORE_EN_VXLAN) += vxlan.o
mlx5_core-$(CONFIG_MLX5_CORE_EN_DCB) += en_dcbnl.o
-mlx5_core-$(CONFIG_RFS_ACCEL) += en_arfs.o
+mlx5_core-$(CONFIG_MLX5_CORE_EN_RFS) += en_arfs.o
--
2.7.0
next prev parent reply other threads:[~2016-05-04 12:32 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-04 12:26 [PATCH 0/3] net/mlx5e: Kconfig fixes Arnd Bergmann
[not found] ` <1462364774-3792510-1-git-send-email-arnd-r2nGTMty4D4@public.gmane.org>
2016-05-04 12:26 ` [PATCH 1/3] Revert "net/mlx5: Kconfig: Fix MLX5_EN/VXLAN build issue" Arnd Bergmann
2016-05-04 12:31 ` [PATCH 2/3] net/mlx5e: make VXLAN support conditional Arnd Bergmann
2016-05-05 16:44 ` Saeed Mahameed
2016-05-05 18:09 ` Arnd Bergmann
2016-05-06 19:35 ` David Miller
[not found] ` <20160506.153556.1442520532117922001.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2016-05-08 11:58 ` Saeed Mahameed
[not found] ` <CALzJLG_rkLvgKE2WnmU_CsdTFaYHEaYhnxyPtTkyQ4hjxdzRMQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-05-12 8:15 ` Arnd Bergmann
2016-05-06 20:12 ` Alexander Duyck
2016-05-04 12:32 ` Arnd Bergmann [this message]
2016-05-04 13:09 ` [PATCH 3/3] net/mlx5e: don't build RFS without ethernet Saeed Mahameed
2016-05-04 14:23 ` Arnd Bergmann
2016-05-04 14:55 ` Saeed Mahameed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1462365155-3861405-1-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=amirv@mellanox.com \
--cc=davem@davemloft.net \
--cc=hagaya@mellanox.com \
--cc=leonro@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=majd@mellanox.com \
--cc=maorg@mellanox.com \
--cc=matanb@mellanox.com \
--cc=matt@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=ogerlitz@mellanox.com \
--cc=richardcochran@gmail.com \
--cc=saeedm@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).