diff options
Diffstat (limited to 'net/tipc/socket.c')
-rw-r--r-- | net/tipc/socket.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index accb02cb3527..4670e1e46c89 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
@@ -778,11 +778,8 @@ void tipc_sk_mcast_rcv(struct net *net, struct sk_buff *buf) | |||
778 | scope = TIPC_NODE_SCOPE; | 778 | scope = TIPC_NODE_SCOPE; |
779 | 779 | ||
780 | /* Create destination port list: */ | 780 | /* Create destination port list: */ |
781 | tipc_nametbl_mc_translate(msg_nametype(msg), | 781 | tipc_nametbl_mc_translate(net, msg_nametype(msg), msg_namelower(msg), |
782 | msg_namelower(msg), | 782 | msg_nameupper(msg), scope, &dports); |
783 | msg_nameupper(msg), | ||
784 | scope, | ||
785 | &dports); | ||
786 | last = dports.count; | 783 | last = dports.count; |
787 | if (!last) { | 784 | if (!last) { |
788 | kfree_skb(buf); | 785 | kfree_skb(buf); |
@@ -943,7 +940,7 @@ static int tipc_sendmsg(struct kiocb *iocb, struct socket *sock, | |||
943 | msg_set_nametype(mhdr, type); | 940 | msg_set_nametype(mhdr, type); |
944 | msg_set_nameinst(mhdr, inst); | 941 | msg_set_nameinst(mhdr, inst); |
945 | msg_set_lookup_scope(mhdr, tipc_addr_scope(domain)); | 942 | msg_set_lookup_scope(mhdr, tipc_addr_scope(domain)); |
946 | dport = tipc_nametbl_translate(type, inst, &dnode); | 943 | dport = tipc_nametbl_translate(net, type, inst, &dnode); |
947 | msg_set_destnode(mhdr, dnode); | 944 | msg_set_destnode(mhdr, dnode); |
948 | msg_set_destport(mhdr, dport); | 945 | msg_set_destport(mhdr, dport); |
949 | if (unlikely(!dport && !dnode)) { | 946 | if (unlikely(!dport && !dnode)) { |
@@ -1765,7 +1762,7 @@ int tipc_sk_rcv(struct net *net, struct sk_buff *skb) | |||
1765 | /* Validate destination and message */ | 1762 | /* Validate destination and message */ |
1766 | tsk = tipc_sk_lookup(net, dport); | 1763 | tsk = tipc_sk_lookup(net, dport); |
1767 | if (unlikely(!tsk)) { | 1764 | if (unlikely(!tsk)) { |
1768 | rc = tipc_msg_eval(skb, &dnode); | 1765 | rc = tipc_msg_eval(net, skb, &dnode); |
1769 | goto exit; | 1766 | goto exit; |
1770 | } | 1767 | } |
1771 | sk = &tsk->sk; | 1768 | sk = &tsk->sk; |