aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/socket.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/tipc/socket.c')
-rw-r--r--net/tipc/socket.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 1f236271766c..d799e50ff722 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -772,7 +772,6 @@ static int tipc_sendmcast(struct socket *sock, struct tipc_name_seq *seq,
772 struct net *net = sock_net(sk); 772 struct net *net = sock_net(sk);
773 int mtu = tipc_bcast_get_mtu(net); 773 int mtu = tipc_bcast_get_mtu(net);
774 struct tipc_mc_method *method = &tsk->mc_method; 774 struct tipc_mc_method *method = &tsk->mc_method;
775 u32 domain = addr_domain(net, TIPC_CLUSTER_SCOPE);
776 struct sk_buff_head pkts; 775 struct sk_buff_head pkts;
777 struct tipc_nlist dsts; 776 struct tipc_nlist dsts;
778 int rc; 777 int rc;
@@ -788,7 +787,7 @@ static int tipc_sendmcast(struct socket *sock, struct tipc_name_seq *seq,
788 /* Lookup destination nodes */ 787 /* Lookup destination nodes */
789 tipc_nlist_init(&dsts, tipc_own_addr(net)); 788 tipc_nlist_init(&dsts, tipc_own_addr(net));
790 tipc_nametbl_lookup_dst_nodes(net, seq->type, seq->lower, 789 tipc_nametbl_lookup_dst_nodes(net, seq->type, seq->lower,
791 seq->upper, domain, &dsts); 790 seq->upper, &dsts);
792 if (!dsts.local && !dsts.remote) 791 if (!dsts.local && !dsts.remote)
793 return -EHOSTUNREACH; 792 return -EHOSTUNREACH;
794 793
@@ -2774,6 +2773,7 @@ static int tipc_sk_join(struct tipc_sock *tsk, struct tipc_group_req *mreq)
2774 if (rc) { 2773 if (rc) {
2775 tipc_group_delete(net, grp); 2774 tipc_group_delete(net, grp);
2776 tsk->group = NULL; 2775 tsk->group = NULL;
2776 return rc;
2777 } 2777 }
2778 /* Eliminate any risk that a broadcast overtakes sent JOINs */ 2778 /* Eliminate any risk that a broadcast overtakes sent JOINs */
2779 tsk->mc_method.rcast = true; 2779 tsk->mc_method.rcast = true;