mlx4: Move the Mellanox driver
Moves the Mellanox driver into drivers/net/ethernet/mellanox/ and make the necessary Kconfig and Makefile changes. CC: Roland Dreier <roland@kernel.org> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
parent
f844a0ead4
commit
5a2cc190eb
@ -1554,30 +1554,6 @@ config PASEMI_MAC
|
|||||||
This driver supports the on-chip 1/10Gbit Ethernet controller on
|
This driver supports the on-chip 1/10Gbit Ethernet controller on
|
||||||
PA Semi's PWRficient line of chips.
|
PA Semi's PWRficient line of chips.
|
||||||
|
|
||||||
config MLX4_EN
|
|
||||||
tristate "Mellanox Technologies 10Gbit Ethernet support"
|
|
||||||
depends on PCI && INET
|
|
||||||
select MLX4_CORE
|
|
||||||
select INET_LRO
|
|
||||||
help
|
|
||||||
This driver supports Mellanox Technologies ConnectX Ethernet
|
|
||||||
devices.
|
|
||||||
|
|
||||||
config MLX4_CORE
|
|
||||||
tristate
|
|
||||||
depends on PCI
|
|
||||||
default n
|
|
||||||
|
|
||||||
config MLX4_DEBUG
|
|
||||||
bool "Verbose debugging output" if (MLX4_CORE && EXPERT)
|
|
||||||
depends on MLX4_CORE
|
|
||||||
default y
|
|
||||||
---help---
|
|
||||||
This option causes debugging code to be compiled into the
|
|
||||||
mlx4_core driver. The output can be turned on via the
|
|
||||||
debug_level module parameter (which can also be set after
|
|
||||||
the driver is loaded through sysfs).
|
|
||||||
|
|
||||||
config TEHUTI
|
config TEHUTI
|
||||||
tristate "Tehuti Networks 10G Ethernet"
|
tristate "Tehuti Networks 10G Ethernet"
|
||||||
depends on PCI
|
depends on PCI
|
||||||
|
@ -157,7 +157,6 @@ obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
|
|||||||
obj-$(CONFIG_DM9000) += dm9000.o
|
obj-$(CONFIG_DM9000) += dm9000.o
|
||||||
obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o
|
obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o
|
||||||
pasemi_mac_driver-objs := pasemi_mac.o pasemi_mac_ethtool.o
|
pasemi_mac_driver-objs := pasemi_mac.o pasemi_mac_ethtool.o
|
||||||
obj-$(CONFIG_MLX4_CORE) += mlx4/
|
|
||||||
obj-$(CONFIG_ENC28J60) += enc28j60.o
|
obj-$(CONFIG_ENC28J60) += enc28j60.o
|
||||||
obj-$(CONFIG_ETHOC) += ethoc.o
|
obj-$(CONFIG_ETHOC) += ethoc.o
|
||||||
obj-$(CONFIG_GRETH) += greth.o
|
obj-$(CONFIG_GRETH) += greth.o
|
||||||
|
@ -20,6 +20,7 @@ source "drivers/net/ethernet/chelsio/Kconfig"
|
|||||||
source "drivers/net/ethernet/emulex/Kconfig"
|
source "drivers/net/ethernet/emulex/Kconfig"
|
||||||
source "drivers/net/ethernet/intel/Kconfig"
|
source "drivers/net/ethernet/intel/Kconfig"
|
||||||
source "drivers/net/ethernet/i825xx/Kconfig"
|
source "drivers/net/ethernet/i825xx/Kconfig"
|
||||||
|
source "drivers/net/ethernet/mellanox/Kconfig"
|
||||||
source "drivers/net/ethernet/qlogic/Kconfig"
|
source "drivers/net/ethernet/qlogic/Kconfig"
|
||||||
source "drivers/net/ethernet/racal/Kconfig"
|
source "drivers/net/ethernet/racal/Kconfig"
|
||||||
source "drivers/net/ethernet/sfc/Kconfig"
|
source "drivers/net/ethernet/sfc/Kconfig"
|
||||||
|
@ -11,6 +11,7 @@ obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
|
|||||||
obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
|
obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
|
||||||
obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
|
obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
|
||||||
obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
|
obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
|
||||||
|
obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
|
||||||
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
|
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
|
||||||
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
|
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
|
||||||
obj-$(CONFIG_SFC) += sfc/
|
obj-$(CONFIG_SFC) += sfc/
|
||||||
|
22
drivers/net/ethernet/mellanox/Kconfig
Normal file
22
drivers/net/ethernet/mellanox/Kconfig
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
#
|
||||||
|
# Mellanox driver configuration
|
||||||
|
#
|
||||||
|
|
||||||
|
config NET_VENDOR_MELLANOX
|
||||||
|
bool "Mellanox devices"
|
||||||
|
depends on PCI && INET
|
||||||
|
---help---
|
||||||
|
If you have a network (Ethernet) card belonging to this class, say Y
|
||||||
|
and read the Ethernet-HOWTO, available from
|
||||||
|
<http://www.tldp.org/docs.html#howto>.
|
||||||
|
|
||||||
|
Note that the answer to this question doesn't directly affect the
|
||||||
|
kernel: saying N will just cause the configurator to skip all
|
||||||
|
the questions about Mellanox cards. If you say Y, you will be asked
|
||||||
|
for your specific card in the following questions.
|
||||||
|
|
||||||
|
if NET_VENDOR_MELLANOX
|
||||||
|
|
||||||
|
source "drivers/net/ethernet/mellanox/mlx4/Kconfig"
|
||||||
|
|
||||||
|
endif # NET_VENDOR_MELLANOX
|
5
drivers/net/ethernet/mellanox/Makefile
Normal file
5
drivers/net/ethernet/mellanox/Makefile
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
#
|
||||||
|
# Makefile for the Mellanox device drivers.
|
||||||
|
#
|
||||||
|
|
||||||
|
obj-$(CONFIG_MLX4_CORE) += mlx4/
|
27
drivers/net/ethernet/mellanox/mlx4/Kconfig
Normal file
27
drivers/net/ethernet/mellanox/mlx4/Kconfig
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
#
|
||||||
|
# Mellanox driver configuration
|
||||||
|
#
|
||||||
|
|
||||||
|
config MLX4_EN
|
||||||
|
tristate "Mellanox Technologies 10Gbit Ethernet support"
|
||||||
|
depends on PCI && INET
|
||||||
|
select MLX4_CORE
|
||||||
|
select INET_LRO
|
||||||
|
---help---
|
||||||
|
This driver supports Mellanox Technologies ConnectX Ethernet
|
||||||
|
devices.
|
||||||
|
|
||||||
|
config MLX4_CORE
|
||||||
|
tristate
|
||||||
|
depends on PCI
|
||||||
|
default n
|
||||||
|
|
||||||
|
config MLX4_DEBUG
|
||||||
|
bool "Verbose debugging output" if (MLX4_CORE && EXPERT)
|
||||||
|
depends on MLX4_CORE
|
||||||
|
default y
|
||||||
|
---help---
|
||||||
|
This option causes debugging code to be compiled into the
|
||||||
|
mlx4_core driver. The output can be turned on via the
|
||||||
|
debug_level module parameter (which can also be set after
|
||||||
|
the driver is loaded through sysfs).
|
Loading…
Reference in New Issue
Block a user