* [PATCH net] rxrpc: Fix incorrect conditional on IPV6
@ 2018-10-12 14:52 David Howells
2018-10-12 15:19 ` Eric Dumazet
0 siblings, 1 reply; 7+ messages in thread
From: David Howells @ 2018-10-12 14:52 UTC (permalink / raw)
Cc: Arnd Bergmann, netdev, dhowells, linux-afs, linux-kernel
The udpv6_encap_enable() function is part of the ipv6 code, and if that is
configured as a loadable module and rxrpc is built in then a build failure
will occur because the conditional check is wrong:
net/rxrpc/local_object.o: In function `rxrpc_lookup_local':
local_object.c:(.text+0x2688): undefined reference to `udpv6_encap_enable'
Use the correct config symbol (CONFIG_AF_RXRPC_IPV6) in the conditional
check rather than CONFIG_IPV6 as that will do the right thing.
Fixes: 5271953cad31 ("rxrpc: Use the UDP encap_rcv hook")
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Arnd Bergmann <arnd@arndb.de>
---
net/rxrpc/local_object.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/rxrpc/local_object.c b/net/rxrpc/local_object.c
index cad0691c2bb4..0906e51d3cfb 100644
--- a/net/rxrpc/local_object.c
+++ b/net/rxrpc/local_object.c
@@ -139,7 +139,7 @@ static int rxrpc_open_socket(struct rxrpc_local *local, struct net *net)
udp_sk(usk)->gro_complete = NULL;
udp_encap_enable();
-#if IS_ENABLED(CONFIG_IPV6)
+#if IS_ENABLED(CONFIG_AF_RXRPC_IPV6)
if (local->srx.transport.family == AF_INET6)
udpv6_encap_enable();
#endif
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH net] rxrpc: Fix incorrect conditional on IPV6
2018-10-12 14:52 [PATCH net] rxrpc: Fix incorrect conditional on IPV6 David Howells
@ 2018-10-12 15:19 ` Eric Dumazet
2018-10-12 15:37 ` David Howells
2018-10-12 18:11 ` David Miller
0 siblings, 2 replies; 7+ messages in thread
From: Eric Dumazet @ 2018-10-12 15:19 UTC (permalink / raw)
To: David Howells; +Cc: Arnd Bergmann, netdev, linux-afs
On 10/12/2018 07:52 AM, David Howells wrote:
> The udpv6_encap_enable() function is part of the ipv6 code, and if that is
> configured as a loadable module and rxrpc is built in then a build failure
> will occur because the conditional check is wrong:
>
> net/rxrpc/local_object.o: In function `rxrpc_lookup_local':
> local_object.c:(.text+0x2688): undefined reference to `udpv6_encap_enable'
>
> Use the correct config symbol (CONFIG_AF_RXRPC_IPV6) in the conditional
> check rather than CONFIG_IPV6 as that will do the right thing.
>
> Fixes: 5271953cad31 ("rxrpc: Use the UDP encap_rcv hook")
> Signed-off-by: David Howells <dhowells@redhat.com>
> cc: Arnd Bergmann <arnd@arndb.de>
Nit : Correct attribution would require a Reported-by: tag
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH net] rxrpc: Fix incorrect conditional on IPV6
2018-10-12 15:19 ` Eric Dumazet
@ 2018-10-12 15:37 ` David Howells
2018-10-12 18:11 ` David Miller
1 sibling, 0 replies; 7+ messages in thread
From: David Howells @ 2018-10-12 15:37 UTC (permalink / raw)
To: Eric Dumazet; +Cc: dhowells, Arnd Bergmann, netdev, linux-afs
Eric Dumazet <eric.dumazet@gmail.com> wrote:
> Nit : Correct attribution would require a Reported-by: tag
Point. I'll repost it with a To: line also, I'm waiting to see if Arnd will
ack it.
David
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH net] rxrpc: Fix incorrect conditional on IPV6
2018-10-12 15:19 ` Eric Dumazet
2018-10-12 15:37 ` David Howells
@ 2018-10-12 18:11 ` David Miller
2018-10-12 20:15 ` David Howells
1 sibling, 1 reply; 7+ messages in thread
From: David Miller @ 2018-10-12 18:11 UTC (permalink / raw)
To: eric.dumazet; +Cc: dhowells, arnd, netdev, linux-afs
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 12 Oct 2018 08:19:20 -0700
>
>
> On 10/12/2018 07:52 AM, David Howells wrote:
>> The udpv6_encap_enable() function is part of the ipv6 code, and if that is
>> configured as a loadable module and rxrpc is built in then a build failure
>> will occur because the conditional check is wrong:
>>
>> net/rxrpc/local_object.o: In function `rxrpc_lookup_local':
>> local_object.c:(.text+0x2688): undefined reference to `udpv6_encap_enable'
>>
>> Use the correct config symbol (CONFIG_AF_RXRPC_IPV6) in the conditional
>> check rather than CONFIG_IPV6 as that will do the right thing.
>>
>> Fixes: 5271953cad31 ("rxrpc: Use the UDP encap_rcv hook")
>> Signed-off-by: David Howells <dhowells@redhat.com>
>> cc: Arnd Bergmann <arnd@arndb.de>
>
> Nit : Correct attribution would require a Reported-by: tag
Right.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH net] rxrpc: Fix incorrect conditional on IPV6
@ 2018-10-12 15:38 David Howells
2018-10-16 5:20 ` David Miller
0 siblings, 1 reply; 7+ messages in thread
From: David Howells @ 2018-10-12 15:38 UTC (permalink / raw)
To: netdev
Cc: kbuild-all, Arnd Bergmann, Arnd Bergmann, dhowells, linux-afs,
linux-kernel
The udpv6_encap_enable() function is part of the ipv6 code, and if that is
configured as a loadable module and rxrpc is built in then a build failure
will occur because the conditional check is wrong:
net/rxrpc/local_object.o: In function `rxrpc_lookup_local':
local_object.c:(.text+0x2688): undefined reference to `udpv6_encap_enable'
Use the correct config symbol (CONFIG_AF_RXRPC_IPV6) in the conditional
check rather than CONFIG_IPV6 as that will do the right thing.
Fixes: 5271953cad31 ("rxrpc: Use the UDP encap_rcv hook")
Reported-by: kbuild-all@01.org
Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
---
net/rxrpc/local_object.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/rxrpc/local_object.c b/net/rxrpc/local_object.c
index cad0691c2bb4..0906e51d3cfb 100644
--- a/net/rxrpc/local_object.c
+++ b/net/rxrpc/local_object.c
@@ -139,7 +139,7 @@ static int rxrpc_open_socket(struct rxrpc_local *local, struct net *net)
udp_sk(usk)->gro_complete = NULL;
udp_encap_enable();
-#if IS_ENABLED(CONFIG_IPV6)
+#if IS_ENABLED(CONFIG_AF_RXRPC_IPV6)
if (local->srx.transport.family == AF_INET6)
udpv6_encap_enable();
#endif
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH net] rxrpc: Fix incorrect conditional on IPV6
2018-10-12 15:38 David Howells
@ 2018-10-16 5:20 ` David Miller
0 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2018-10-16 5:20 UTC (permalink / raw)
To: dhowells; +Cc: netdev, kbuild-all, arnd, linux-afs, linux-kernel
From: David Howells <dhowells@redhat.com>
Date: Fri, 12 Oct 2018 16:38:36 +0100
> The udpv6_encap_enable() function is part of the ipv6 code, and if that is
> configured as a loadable module and rxrpc is built in then a build failure
> will occur because the conditional check is wrong:
>
> net/rxrpc/local_object.o: In function `rxrpc_lookup_local':
> local_object.c:(.text+0x2688): undefined reference to `udpv6_encap_enable'
>
> Use the correct config symbol (CONFIG_AF_RXRPC_IPV6) in the conditional
> check rather than CONFIG_IPV6 as that will do the right thing.
>
> Fixes: 5271953cad31 ("rxrpc: Use the UDP encap_rcv hook")
> Reported-by: kbuild-all@01.org
> Reported-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: David Howells <dhowells@redhat.com>
> Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Applied.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-10-16 5:20 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-12 14:52 [PATCH net] rxrpc: Fix incorrect conditional on IPV6 David Howells
2018-10-12 15:19 ` Eric Dumazet
2018-10-12 15:37 ` David Howells
2018-10-12 18:11 ` David Miller
2018-10-12 20:15 ` David Howells
-- strict thread matches above, loose matches on Subject: below --
2018-10-12 15:38 David Howells
2018-10-16 5:20 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox