diff options
| author | Amir Vadai <amirv@mellanox.com> | 2015-05-28 22:28:48 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-30 18:24:51 -0700 |
| commit | f62b8bb8f2d30582f30f51e85a8c0e1260125d7e (patch) | |
| tree | 64a8da331114ff1b10ddd2deeacb7e2f7aa98af0 /drivers/infiniband | |
| parent | afb736e9330ad6b2b6935d2f53ded784eb73f12d (diff) | |
| download | linux-f62b8bb8f2d30582f30f51e85a8c0e1260125d7e.tar.gz linux-f62b8bb8f2d30582f30f51e85a8c0e1260125d7e.tar.bz2 linux-f62b8bb8f2d30582f30f51e85a8c0e1260125d7e.zip | |
net/mlx5: Extend mlx5_core to support ConnectX-4 Ethernet functionality
This is the Ethernet part of the driver for the Mellanox ConnectX(R)-4
Single/Dual-Port Adapter supporting 100Gb/s with VPI. The driver
extends the existing mlx5 driver with Ethernet functionality.
This patch contains the driver entry points but does not include
transmit and receive (see the previous patch in the series) routines.
It also adds the option MLX5_CORE_EN to Kconfig to enable/disable the
Ethernet functionality. Currently, Kconfig is programmed to make
Ethernet and Infiniband functionality mutally exclusive.
Also changed MLX5_INFINIBAND to be depandant on MLX5_CORE instead of
selecting it, since MLX5_CORE could be selected without MLX5_INFINIBAND
being selected.
Signed-off-by: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/hw/mlx5/Kconfig | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/mlx5/Kconfig b/drivers/infiniband/hw/mlx5/Kconfig index 10df386c6344..bce263b92821 100644 --- a/drivers/infiniband/hw/mlx5/Kconfig +++ b/drivers/infiniband/hw/mlx5/Kconfig @@ -1,8 +1,6 @@ config MLX5_INFINIBAND tristate "Mellanox Connect-IB HCA support" - depends on NETDEVICES && ETHERNET && PCI - select NET_VENDOR_MELLANOX - select MLX5_CORE + depends on NETDEVICES && ETHERNET && PCI && MLX5_CORE ---help--- This driver provides low-level InfiniBand support for Mellanox Connect-IB PCI Express host channel adapters (HCAs). |