You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
109 lines
4.2 KiB
109 lines
4.2 KiB
4 years ago
|
From 04f6b2f616074ee8524c017915640770c17e365a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alaa Hleihel <ahleihel@redhat.com>
|
||
|
|
Date: Sun, 10 May 2020 14:52:28 -0400
|
||
|
|
Subject: [PATCH 055/312] [netdrv] drivers: net: Fix Kconfig indentation
|
||
|
|
|
||
|
|
Message-id: <20200510145245.10054-66-ahleihel@redhat.com>
|
||
|
|
Patchwork-id: 306606
|
||
|
|
Patchwork-instance: patchwork
|
||
|
|
O-Subject: [RHEL8.3 BZ 1789378 v2 65/82] drivers: net: Fix Kconfig indentation
|
||
|
|
Bugzilla: 1789378
|
||
|
|
RH-Acked-by: Kamal Heib <kheib@redhat.com>
|
||
|
|
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
||
|
|
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
||
|
|
RH-Acked-by: Jonathan Toppins <jtoppins@redhat.com>
|
||
|
|
|
||
|
|
Bugzilla: http://bugzilla.redhat.com/1789378
|
||
|
|
Upstream: v5.4-rc1
|
||
|
|
Conflicts:
|
||
|
|
- Take mlx5 changes only.
|
||
|
|
|
||
|
|
commit 02bc5eb990597796d8e8383d1b98e540af963bf1
|
||
|
|
Author: Krzysztof Kozlowski <krzk@kernel.org>
|
||
|
|
Date: Mon Sep 23 17:52:43 2019 +0200
|
||
|
|
|
||
|
|
drivers: net: Fix Kconfig indentation
|
||
|
|
|
||
|
|
Adjust indentation from spaces to tab (+optional two spaces) as in
|
||
|
|
coding style with command like:
|
||
|
|
$ sed -e 's/^ /\t/' -i */Kconfig
|
||
|
|
|
||
|
|
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
|
||
|
|
Acked-by: Kalle Valo <kvalo@codeaurora.org>
|
||
|
|
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
|
||
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||
|
|
|
||
|
|
Signed-off-by: Alaa Hleihel <ahleihel@redhat.com>
|
||
|
|
Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 36 ++++++++++++-------------
|
||
|
|
1 file changed, 18 insertions(+), 18 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
|
||
|
|
index 361c783ec9b5..6919161c8f9b 100644
|
||
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
|
||
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
|
||
|
|
@@ -19,15 +19,15 @@ config MLX5_ACCEL
|
||
|
|
bool
|
||
|
|
|
||
|
|
config MLX5_FPGA
|
||
|
|
- bool "Mellanox Technologies Innova support"
|
||
|
|
- depends on MLX5_CORE
|
||
|
|
+ bool "Mellanox Technologies Innova support"
|
||
|
|
+ depends on MLX5_CORE
|
||
|
|
select MLX5_ACCEL
|
||
|
|
- ---help---
|
||
|
|
- Build support for the Innova family of network cards by Mellanox
|
||
|
|
- Technologies. Innova network cards are comprised of a ConnectX chip
|
||
|
|
- and an FPGA chip on one board. If you select this option, the
|
||
|
|
- mlx5_core driver will include the Innova FPGA core and allow building
|
||
|
|
- sandbox-specific client drivers.
|
||
|
|
+ ---help---
|
||
|
|
+ Build support for the Innova family of network cards by Mellanox
|
||
|
|
+ Technologies. Innova network cards are comprised of a ConnectX chip
|
||
|
|
+ and an FPGA chip on one board. If you select this option, the
|
||
|
|
+ mlx5_core driver will include the Innova FPGA core and allow building
|
||
|
|
+ sandbox-specific client drivers.
|
||
|
|
|
||
|
|
config MLX5_CORE_EN
|
||
|
|
bool "Mellanox 5th generation network adapters (ConnectX series) Ethernet support"
|
||
|
|
@@ -57,14 +57,14 @@ config MLX5_EN_RXNFC
|
||
|
|
API.
|
||
|
|
|
||
|
|
config MLX5_MPFS
|
||
|
|
- bool "Mellanox Technologies MLX5 MPFS support"
|
||
|
|
- depends on MLX5_CORE_EN
|
||
|
|
+ bool "Mellanox Technologies MLX5 MPFS support"
|
||
|
|
+ depends on MLX5_CORE_EN
|
||
|
|
default y
|
||
|
|
- ---help---
|
||
|
|
+ ---help---
|
||
|
|
Mellanox Technologies Ethernet Multi-Physical Function Switch (MPFS)
|
||
|
|
- support in ConnectX NIC. MPFs is required for when multi-PF configuration
|
||
|
|
- is enabled to allow passing user configured unicast MAC addresses to the
|
||
|
|
- requesting PF.
|
||
|
|
+ support in ConnectX NIC. MPFs is required for when multi-PF configuration
|
||
|
|
+ is enabled to allow passing user configured unicast MAC addresses to the
|
||
|
|
+ requesting PF.
|
||
|
|
|
||
|
|
config MLX5_ESWITCH
|
||
|
|
bool "Mellanox Technologies MLX5 SRIOV E-Switch support"
|
||
|
|
@@ -72,10 +72,10 @@ config MLX5_ESWITCH
|
||
|
|
default y
|
||
|
|
---help---
|
||
|
|
Mellanox Technologies Ethernet SRIOV E-Switch support in ConnectX NIC.
|
||
|
|
- E-Switch provides internal SRIOV packet steering and switching for the
|
||
|
|
- enabled VFs and PF in two available modes:
|
||
|
|
- Legacy SRIOV mode (L2 mac vlan steering based).
|
||
|
|
- Switchdev mode (eswitch offloads).
|
||
|
|
+ E-Switch provides internal SRIOV packet steering and switching for the
|
||
|
|
+ enabled VFs and PF in two available modes:
|
||
|
|
+ Legacy SRIOV mode (L2 mac vlan steering based).
|
||
|
|
+ Switchdev mode (eswitch offloads).
|
||
|
|
|
||
|
|
config MLX5_CORE_EN_DCB
|
||
|
|
bool "Data Center Bridging (DCB) Support"
|
||
|
|
--
|
||
|
|
2.13.6
|
||
|
|
|