[net-next] rxrpc: Fix dependency on IPv6 in udp tunnel config

As udp_port_cfg struct changes its members with dependency on IPv6
configuration, the code in rxrpc should also check for IPv6.

Fixes: 1a9b86c9fd95 ("rxrpc: use udp tunnel APIs instead of open code in rxrpc_open_socket")
Reported-by: kernel test robot <redacted>
Signed-off-by: Vadim Fedorenko <redacted>
---
 net/rxrpc/local_object.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/rxrpc/local_object.c b/net/rxrpc/local_object.c
index 546fd237a649..a4111408ffd0 100644
--- a/net/rxrpc/local_object.c
+++ b/net/rxrpc/local_object.c

@@ -120,9 +120,11 @@ static int rxrpc_open_socket(struct rxrpc_local *local, struct net *net)
 	if (udp_conf.family == AF_INET) {
 		udp_conf.local_ip = srx->transport.sin.sin_addr;
 		udp_conf.local_udp_port = srx->transport.sin.sin_port;
+#if IS_ENABLED(CONFIG_AF_RXRPC_IPV6)
 	} else {
 		udp_conf.local_ip6 = srx->transport.sin6.sin6_addr;
 		udp_conf.local_udp_port = srx->transport.sin6.sin6_port;
+#endif
 	}
 	ret = udp_sock_create(net, &udp_conf, &local->socket);
 	if (ret < 0) {

-- 
2.18.4

On 09.02.2021 13:54, Vadim Fedorenko wrote:

As udp_port_cfg struct changes its members with dependency on IPv6
configuration, the code in rxrpc should also check for IPv6.

Looks like this patch was mistakely tagged as superseded by
dc0e6056decc rxrpc: Fix missing dependency on NET_UDP_TUNNEL
Although both patches have the same Fixes tag, this one fixes
different problem - rxrpc subsystem could not be compiled without
support for IPv6 because the code tries to access ipv6-specific
members of struct udp_port_cfg.

Should I resend it?

On Thu, 11 Feb 2021 19:12:57 +0000 Vadim Fedorenko wrote:

On 09.02.2021 13:54, Vadim Fedorenko wrote:

quoted

As udp_port_cfg struct changes its members with dependency on IPv6
configuration, the code in rxrpc should also check for IPv6.  

Looks like this patch was mistakely tagged as superseded by
dc0e6056decc rxrpc: Fix missing dependency on NET_UDP_TUNNEL
Although both patches have the same Fixes tag, this one fixes
different problem - rxrpc subsystem could not be compiled without
support for IPv6 because the code tries to access ipv6-specific
members of struct udp_port_cfg.

It does happen sometimes, it's the patchwork bot marking things as
superseded :(
 

Should I resend it?

Yes, that'd probably be easiest for Dave to handle.