aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/Kconfig
diff options
context:
space:
mode:
authorMatan Barak <matanb@mellanox.com>2014-01-16 17:16:47 +0200
committerRoland Dreier <roland@purestorage.com>2014-01-19 15:14:04 -0800
commit2f85d24e604c1532723c4b5791816b533baed2c3 (patch)
treee5371edde3d4096e89db7855278c4e97472811fa /drivers/infiniband/Kconfig
parentIB/core: Resolve Ethernet L2 addresses when modifying QP (diff)
downloadlinux-dev-2f85d24e604c1532723c4b5791816b533baed2c3.tar.xz
linux-dev-2f85d24e604c1532723c4b5791816b533baed2c3.zip
IB/core: Make ib_addr a core IB module
IP based addressing introduces the usage of rdma_addr_find_dmac_by_grh() within ib_core. Since this function is declared in ib_addr, ib_addr should be a part of the core INFINIBAND modules, rather than INFINIBAND_ADDR_TRANS. Signed-off-by: Matan Barak <matanb@mellanox.com> Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband/Kconfig')
-rw-r--r--drivers/infiniband/Kconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index 5ceda710f516..3c101a07f17c 100644
--- a/drivers/infiniband/Kconfig
+++ b/drivers/infiniband/Kconfig
@@ -3,6 +3,8 @@ menuconfig INFINIBAND
depends on PCI || BROKEN
depends on HAS_IOMEM
depends on NET
+ depends on INET
+ depends on m || IPV6 != m
---help---
Core support for InfiniBand (IB). Make sure to also select
any protocols you wish to use as well as drivers for your
@@ -38,8 +40,7 @@ config INFINIBAND_USER_MEM
config INFINIBAND_ADDR_TRANS
bool
- depends on INET
- depends on !(INFINIBAND = y && IPV6 = m)
+ depends on INFINIBAND
default y
source "drivers/infiniband/hw/mthca/Kconfig"