diff options
author | Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> | 2015-03-19 15:47:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-19 16:06:27 -0400 |
commit | 446981e5fcad3d64a27358d6591928da4a55a156 (patch) | |
tree | 48594d4536820e272c63f27d59d506a1d2f8eeff /net/tipc | |
parent | d15b1de46ffa7551c36d7be5a58a02321a820a0f (diff) |
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>
Diffstat (limited to 'net/tipc')
-rw-r--r-- | net/tipc/udp_media.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c index 04836dd70c2b..ac89101e5d1b 100644 --- a/net/tipc/udp_media.c +++ b/net/tipc/udp_media.c | |||
@@ -44,6 +44,7 @@ | |||
44 | #include <net/sock.h> | 44 | #include <net/sock.h> |
45 | #include <net/ip.h> | 45 | #include <net/ip.h> |
46 | #include <net/udp_tunnel.h> | 46 | #include <net/udp_tunnel.h> |
47 | #include <net/addrconf.h> | ||
47 | #include <linux/tipc_netlink.h> | 48 | #include <linux/tipc_netlink.h> |
48 | #include "core.h" | 49 | #include "core.h" |
49 | #include "bearer.h" | 50 | #include "bearer.h" |
@@ -247,10 +248,13 @@ static int enable_mcast(struct udp_bearer *ub, struct udp_media_addr *remote) | |||
247 | mreqn.imr_multiaddr = remote->ipv4; | 248 | mreqn.imr_multiaddr = remote->ipv4; |
248 | mreqn.imr_ifindex = ub->ifindex; | 249 | mreqn.imr_ifindex = ub->ifindex; |
249 | err = ip_mc_join_group(sk, &mreqn); | 250 | err = ip_mc_join_group(sk, &mreqn); |
251 | #if IS_ENABLED(CONFIG_IPV6) | ||
250 | } else { | 252 | } else { |
251 | if (!ipv6_addr_is_multicast(&remote->ipv6)) | 253 | if (!ipv6_addr_is_multicast(&remote->ipv6)) |
252 | return 0; | 254 | return 0; |
253 | err = ipv6_sock_mc_join(sk, ub->ifindex, &remote->ipv6); | 255 | err = ipv6_stub->ipv6_sock_mc_join(sk, ub->ifindex, |
256 | &remote->ipv6); | ||
257 | #endif | ||
254 | } | 258 | } |
255 | return err; | 259 | return err; |
256 | } | 260 | } |