diff options
Diffstat (limited to 'net/tipc/socket.c')
-rw-r--r-- | net/tipc/socket.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 5b0b08d58fcc..e2d5b9831485 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
@@ -260,7 +260,7 @@ static void tsk_rej_rx_queue(struct sock *sk) | |||
260 | u32 own_node = tsk_own_node(tipc_sk(sk)); | 260 | u32 own_node = tsk_own_node(tipc_sk(sk)); |
261 | 261 | ||
262 | while ((skb = __skb_dequeue(&sk->sk_receive_queue))) { | 262 | while ((skb = __skb_dequeue(&sk->sk_receive_queue))) { |
263 | if (tipc_msg_reverse(own_node, skb, &dnode, TIPC_ERR_NO_PORT)) | 263 | if (tipc_msg_reverse(own_node, &skb, &dnode, TIPC_ERR_NO_PORT)) |
264 | tipc_node_xmit_skb(sock_net(sk), skb, dnode, 0); | 264 | tipc_node_xmit_skb(sock_net(sk), skb, dnode, 0); |
265 | } | 265 | } |
266 | } | 266 | } |
@@ -441,7 +441,7 @@ static int tipc_release(struct socket *sock) | |||
441 | tsk->connected = 0; | 441 | tsk->connected = 0; |
442 | tipc_node_remove_conn(net, dnode, tsk->portid); | 442 | tipc_node_remove_conn(net, dnode, tsk->portid); |
443 | } | 443 | } |
444 | if (tipc_msg_reverse(tsk_own_node(tsk), skb, &dnode, | 444 | if (tipc_msg_reverse(tsk_own_node(tsk), &skb, &dnode, |
445 | TIPC_ERR_NO_PORT)) | 445 | TIPC_ERR_NO_PORT)) |
446 | tipc_node_xmit_skb(net, skb, dnode, 0); | 446 | tipc_node_xmit_skb(net, skb, dnode, 0); |
447 | } | 447 | } |
@@ -784,7 +784,7 @@ static void tipc_sk_proto_rcv(struct tipc_sock *tsk, struct sk_buff **skb) | |||
784 | if (conn_cong) | 784 | if (conn_cong) |
785 | tsk->sk.sk_write_space(&tsk->sk); | 785 | tsk->sk.sk_write_space(&tsk->sk); |
786 | } else if (msg_type(msg) == CONN_PROBE) { | 786 | } else if (msg_type(msg) == CONN_PROBE) { |
787 | if (tipc_msg_reverse(own_node, *skb, &dnode, TIPC_OK)) { | 787 | if (tipc_msg_reverse(own_node, skb, &dnode, TIPC_OK)) { |
788 | msg_set_type(msg, CONN_PROBE_REPLY); | 788 | msg_set_type(msg, CONN_PROBE_REPLY); |
789 | return; | 789 | return; |
790 | } | 790 | } |
@@ -1702,7 +1702,7 @@ static int tipc_backlog_rcv(struct sock *sk, struct sk_buff *skb) | |||
1702 | atomic_add(truesize, dcnt); | 1702 | atomic_add(truesize, dcnt); |
1703 | return 0; | 1703 | return 0; |
1704 | } | 1704 | } |
1705 | if (!err || tipc_msg_reverse(tsk_own_node(tsk), skb, &dnode, -err)) | 1705 | if (!err || tipc_msg_reverse(tsk_own_node(tsk), &skb, &dnode, -err)) |
1706 | tipc_node_xmit_skb(net, skb, dnode, tsk->portid); | 1706 | tipc_node_xmit_skb(net, skb, dnode, tsk->portid); |
1707 | return 0; | 1707 | return 0; |
1708 | } | 1708 | } |
@@ -1796,7 +1796,7 @@ int tipc_sk_rcv(struct net *net, struct sk_buff_head *inputq) | |||
1796 | goto xmit; | 1796 | goto xmit; |
1797 | } | 1797 | } |
1798 | tn = net_generic(net, tipc_net_id); | 1798 | tn = net_generic(net, tipc_net_id); |
1799 | if (!tipc_msg_reverse(tn->own_addr, skb, &dnode, -err)) | 1799 | if (!tipc_msg_reverse(tn->own_addr, &skb, &dnode, -err)) |
1800 | continue; | 1800 | continue; |
1801 | xmit: | 1801 | xmit: |
1802 | tipc_node_xmit_skb(net, skb, dnode, dport); | 1802 | tipc_node_xmit_skb(net, skb, dnode, dport); |
@@ -2090,7 +2090,7 @@ restart: | |||
2090 | kfree_skb(skb); | 2090 | kfree_skb(skb); |
2091 | goto restart; | 2091 | goto restart; |
2092 | } | 2092 | } |
2093 | if (tipc_msg_reverse(tsk_own_node(tsk), skb, &dnode, | 2093 | if (tipc_msg_reverse(tsk_own_node(tsk), &skb, &dnode, |
2094 | TIPC_CONN_SHUTDOWN)) | 2094 | TIPC_CONN_SHUTDOWN)) |
2095 | tipc_node_xmit_skb(net, skb, dnode, | 2095 | tipc_node_xmit_skb(net, skb, dnode, |
2096 | tsk->portid); | 2096 | tsk->portid); |