Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tipc: fix build issue when building without IPv6

We can't directly call ipv6_sock_mc_join() but should use the stub
instead and protect it around IS_ENABLED.

Fixes: d0f91938bede ("tipc: add ip/udp media type")
Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Marcelo Ricardo Leitner and committed by
David S. Miller
446981e5 d15b1de4

+5 -1
+5 -1
net/tipc/udp_media.c
··· 44 44 #include <net/sock.h> 45 45 #include <net/ip.h> 46 46 #include <net/udp_tunnel.h> 47 + #include <net/addrconf.h> 47 48 #include <linux/tipc_netlink.h> 48 49 #include "core.h" 49 50 #include "bearer.h" ··· 248 247 mreqn.imr_multiaddr = remote->ipv4; 249 248 mreqn.imr_ifindex = ub->ifindex; 250 249 err = ip_mc_join_group(sk, &mreqn); 250 + #if IS_ENABLED(CONFIG_IPV6) 251 251 } else { 252 252 if (!ipv6_addr_is_multicast(&remote->ipv6)) 253 253 return 0; 254 - err = ipv6_sock_mc_join(sk, ub->ifindex, &remote->ipv6); 254 + err = ipv6_stub->ipv6_sock_mc_join(sk, ub->ifindex, 255 + &remote->ipv6); 256 + #endif 255 257 } 256 258 return err; 257 259 }