diff mbox series

rds: fix building with IPV6=m

Message ID 20180814090752.1681486-1-arnd@arndb.de (mailing list archive)
State Not Applicable
Headers show
Series rds: fix building with IPV6=m | expand

Commit Message

Arnd Bergmann Aug. 14, 2018, 9:07 a.m. UTC
When CONFIG_RDS_TCP is built-in and CONFIG_IPV6 is a loadable
module, we get a link error agains the modular ipv6_chk_addr()
function:

net/rds/tcp.o: In function `rds_tcp_laddr_check':
tcp.c:(.text+0x3b2): undefined reference to `ipv6_chk_addr'

This adds back a dependency that forces RDS_TCP to also be
a loadable module when IPV6 is one.

Fixes: e65d4d96334e ("rds: Remove IPv6 dependency")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 net/rds/Kconfig | 1 +
 1 file changed, 1 insertion(+)

Comments

Santosh Shilimkar Aug. 14, 2018, 4:53 p.m. UTC | #1
On 8/14/2018 2:07 AM, Arnd Bergmann wrote:
> When CONFIG_RDS_TCP is built-in and CONFIG_IPV6 is a loadable
> module, we get a link error agains the modular ipv6_chk_addr()
> function:
> 
> net/rds/tcp.o: In function `rds_tcp_laddr_check':
> tcp.c:(.text+0x3b2): undefined reference to `ipv6_chk_addr'
> 
> This adds back a dependency that forces RDS_TCP to also be
> a loadable module when IPV6 is one.
> 
> Fixes: e65d4d96334e ("rds: Remove IPv6 dependency")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>   net/rds/Kconfig | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/net/rds/Kconfig b/net/rds/Kconfig
> index 41f75563b54b..01b3bd6a3708 100644
> --- a/net/rds/Kconfig
> +++ b/net/rds/Kconfig
> @@ -16,6 +16,7 @@ config RDS_RDMA
>   config RDS_TCP
>   	tristate "RDS over TCP"
>   	depends on RDS
> +	depends on IPV6 || !IPV6
>   	---help---
>   	  Allow RDS to use TCP as a transport.
>   	  This transport does not support RDMA operations.
> 
Its weird depends on but probably ok since we get to module
to be enabled with or without IPV6.

Thanks for the patch Arnd !!

Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
David Miller Aug. 14, 2018, 5:06 p.m. UTC | #2
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 14 Aug 2018 11:07:42 +0200

> When CONFIG_RDS_TCP is built-in and CONFIG_IPV6 is a loadable
> module, we get a link error agains the modular ipv6_chk_addr()
> function:
> 
> net/rds/tcp.o: In function `rds_tcp_laddr_check':
> tcp.c:(.text+0x3b2): undefined reference to `ipv6_chk_addr'
> 
> This adds back a dependency that forces RDS_TCP to also be
> a loadable module when IPV6 is one.
> 
> Fixes: e65d4d96334e ("rds: Remove IPv6 dependency")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Applied.
Greg Thelen Aug. 14, 2018, 7:15 p.m. UTC | #3
Arnd Bergmann <arnd@arndb.de> wrote:

> When CONFIG_RDS_TCP is built-in and CONFIG_IPV6 is a loadable
> module, we get a link error agains the modular ipv6_chk_addr()
> function:
>
> net/rds/tcp.o: In function `rds_tcp_laddr_check':
> tcp.c:(.text+0x3b2): undefined reference to `ipv6_chk_addr'
>
> This adds back a dependency that forces RDS_TCP to also be
> a loadable module when IPV6 is one.
>
> Fixes: e65d4d96334e ("rds: Remove IPv6 dependency")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Acked-by: Greg Thelen <gthelenq@google.com>
diff mbox series

Patch

diff --git a/net/rds/Kconfig b/net/rds/Kconfig
index 41f75563b54b..01b3bd6a3708 100644
--- a/net/rds/Kconfig
+++ b/net/rds/Kconfig
@@ -16,6 +16,7 @@  config RDS_RDMA
 config RDS_TCP
 	tristate "RDS over TCP"
 	depends on RDS
+	depends on IPV6 || !IPV6
 	---help---
 	  Allow RDS to use TCP as a transport.
 	  This transport does not support RDMA operations.