projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
[linux-2.6-block.git]
/
drivers
/
net
/
ethernet
/
mellanox
/
mlx5
/
core
/
Kconfig
diff --git
a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
index 2545296a0c087888701048dfd36b957cb91c6993..7a84dd07ced2524178eeffb1b45dec7f1b98a604 100644
(file)
--- a/
drivers/net/ethernet/mellanox/mlx5/core/Kconfig
+++ b/
drivers/net/ethernet/mellanox/mlx5/core/Kconfig
@@
-3,7
+3,7
@@
#
config MLX5_CORE
#
config MLX5_CORE
- tristate "Mellanox
Technologies ConnectX-4 and Connect-IB
core driver"
+ tristate "Mellanox
5th generation network adapters (ConnectX series)
core driver"
depends on MAY_USE_DEVLINK
depends on PCI
imply PTP_1588_CLOCK
depends on MAY_USE_DEVLINK
depends on PCI
imply PTP_1588_CLOCK
@@
-27,7
+27,7
@@
config MLX5_FPGA
sandbox-specific client drivers.
config MLX5_CORE_EN
sandbox-specific client drivers.
config MLX5_CORE_EN
- bool "Mellanox
Technologies ConnectX-4
Ethernet support"
+ bool "Mellanox
5th generation network adapters (ConnectX series)
Ethernet support"
depends on NETDEVICES && ETHERNET && INET && PCI && MLX5_CORE
depends on IPV6=y || IPV6=n || MLX5_CORE=m
select PAGE_POOL
depends on NETDEVICES && ETHERNET && INET && PCI && MLX5_CORE
depends on IPV6=y || IPV6=n || MLX5_CORE=m
select PAGE_POOL
@@
-69,7
+69,7
@@
config MLX5_CORE_EN_DCB
If unsure, set to Y
config MLX5_CORE_IPOIB
If unsure, set to Y
config MLX5_CORE_IPOIB
- bool "Mellanox
Technologies ConnectX-4
IPoIB offloads support"
+ bool "Mellanox
5th generation network adapters (connectX series)
IPoIB offloads support"
depends on MLX5_CORE_EN
default n
---help---
depends on MLX5_CORE_EN
default n
---help---