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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index f553fdecc1d2..b630f3839ca3 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -783,7 +783,7 @@ static int auto_connect(struct socket *sock, struct tipc_msg *msg)
783 783
784 tsock->peer_name.ref = msg_origport(msg); 784 tsock->peer_name.ref = msg_origport(msg);
785 tsock->peer_name.node = msg_orignode(msg); 785 tsock->peer_name.node = msg_orignode(msg);
786 tipc_connect2port(tsock->p->ref, &tsock->peer_name); 786 tipc_connect(tsock->p->ref, &tsock->peer_name);
787 tipc_set_portimportance(tsock->p->ref, msg_importance(msg)); 787 tipc_set_portimportance(tsock->p->ref, msg_importance(msg));
788 sock->state = SS_CONNECTED; 788 sock->state = SS_CONNECTED;
789 return 0; 789 return 0;
@@ -1246,7 +1246,7 @@ static u32 filter_rcv(struct sock *sk, struct sk_buff *buf)
1246 /* Initiate connection termination for an incoming 'FIN' */ 1246 /* Initiate connection termination for an incoming 'FIN' */
1247 if (unlikely(msg_errcode(msg) && (sock->state == SS_CONNECTED))) { 1247 if (unlikely(msg_errcode(msg) && (sock->state == SS_CONNECTED))) {
1248 sock->state = SS_DISCONNECTING; 1248 sock->state = SS_DISCONNECTING;
1249 tipc_disconnect_port(tipc_sk_port(sk)); 1249 __tipc_disconnect(tipc_sk_port(sk));
1250 } 1250 }
1251 1251
1252 sk->sk_data_ready(sk, 0); 1252 sk->sk_data_ready(sk, 0);
@@ -1506,7 +1506,7 @@ static int accept(struct socket *sock, struct socket *new_sock, int flags)
1506 /* Connect new socket to it's peer */ 1506 /* Connect new socket to it's peer */
1507 new_tsock->peer_name.ref = msg_origport(msg); 1507 new_tsock->peer_name.ref = msg_origport(msg);
1508 new_tsock->peer_name.node = msg_orignode(msg); 1508 new_tsock->peer_name.node = msg_orignode(msg);
1509 tipc_connect2port(new_ref, &new_tsock->peer_name); 1509 tipc_connect(new_ref, &new_tsock->peer_name);
1510 new_sock->state = SS_CONNECTED; 1510 new_sock->state = SS_CONNECTED;
1511 1511
1512 tipc_set_portimportance(new_ref, msg_importance(msg)); 1512 tipc_set_portimportance(new_ref, msg_importance(msg));