[PATCH for-next] IB/core: Add a dependency of ib_core in ib_addr

[PATCH for-next] IB/core: Add a dependency of ib_core in ib_addr

[Matan Barak]

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 INFINIBAND modules, rather than
INFINIBAND_ADDR_TRANS.

Signed-off-by: Matan Barak <matanb-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
---
Hi Roland,

This patch adds ib_addr and its dependencies to the INFINIBAND module.
Since ib_core uses ib_addr to resolve the MAC address, this introduces
a direct dependency of INFINIBAND in INET.

Regards,
Matan

 drivers/infiniband/Kconfig       |    5 +++--
 drivers/infiniband/core/Makefile |    5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index 10219ee..7708939 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"
diff --git a/drivers/infiniband/core/Makefile b/drivers/infiniband/core/Makefile
index c8bbaef..3ab3865 100644
--- a/drivers/infiniband/core/Makefile
+++ b/drivers/infiniband/core/Makefile
@@ -1,8 +1,9 @@
-infiniband-$(CONFIG_INFINIBAND_ADDR_TRANS)	:= ib_addr.o rdma_cm.o
+infiniband-$(CONFIG_INFINIBAND_ADDR_TRANS)	:= rdma_cm.o
 user_access-$(CONFIG_INFINIBAND_ADDR_TRANS)	:= rdma_ucm.o
 
 obj-$(CONFIG_INFINIBAND) +=		ib_core.o ib_mad.o ib_sa.o \
-					ib_cm.o iw_cm.o $(infiniband-y)
+					ib_cm.o iw_cm.o ib_addr.o \
+					$(infiniband-y)
 obj-$(CONFIG_INFINIBAND_USER_MAD) +=	ib_umad.o
 obj-$(CONFIG_INFINIBAND_USER_ACCESS) +=	ib_uverbs.o ib_ucm.o \
 					$(user_access-y)
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH for-next] IB/mlx4: Add dependency INET

[Matan Barak]

Since mlx4_ib supports IP based addressing, a dependency on
INET should be added. This is mandatory since mlx4_ib
registers itself to net device events.

Signed-off-by: Matan Barak <matanb-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
---
Hi Roland,

The mlx4_ib driver registers itself to network events.
This is mandatory for adding IP based GIDs.
Thus, we need to introduce a new dependency on INET.

Thanks,
Matan

 drivers/infiniband/hw/mlx4/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/infiniband/hw/mlx4/Kconfig b/drivers/infiniband/hw/mlx4/Kconfig
index 24ab11a..fc01dea 100644
--- a/drivers/infiniband/hw/mlx4/Kconfig
+++ b/drivers/infiniband/hw/mlx4/Kconfig
@@ -1,6 +1,6 @@
 config MLX4_INFINIBAND
 	tristate "Mellanox ConnectX HCA support"
-	depends on NETDEVICES && ETHERNET && PCI
+	depends on NETDEVICES && ETHERNET && PCI && INET
 	select NET_VENDOR_MELLANOX
 	select MLX4_CORE
 	---help---
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH for-next] IB/mlx4: Add dependency INET

[Or Gerlitz]

On 16/01/2014 17:16, Matan Barak wrote:
> Since mlx4_ib supports IP based addressing, a dependency on
> INET should be added. This is mandatory since mlx4_ib
> registers itself to net device events.
>
> Signed-off-by: Matan Barak <matanb-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
> ---
> Hi Roland,
>
> The mlx4_ib driver registers itself to network events.
> This is mandatory for adding IP based GIDs.
> Thus, we need to introduce a new dependency on INET.

Roland, I see that you've picked this patch, thanks. Note the same patch 
need to be done for ocrdma, since
it also registered to the notifiers under the IP addressing patches.

Or.




>
> Thanks,
> Matan
>
>   drivers/infiniband/hw/mlx4/Kconfig |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/infiniband/hw/mlx4/Kconfig b/drivers/infiniband/hw/mlx4/Kconfig
> index 24ab11a..fc01dea 100644
> --- a/drivers/infiniband/hw/mlx4/Kconfig
> +++ b/drivers/infiniband/hw/mlx4/Kconfig
> @@ -1,6 +1,6 @@
>   config MLX4_INFINIBAND
>   	tristate "Mellanox ConnectX HCA support"
> -	depends on NETDEVICES && ETHERNET && PCI
> +	depends on NETDEVICES && ETHERNET && PCI && INET
>   	select NET_VENDOR_MELLANOX
>   	select MLX4_CORE
>   	---help---

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html