Skip to content

Commit

Permalink
tipc: eliminate connection setup for implied connect in recv_msg()
Browse files Browse the repository at this point in the history
As connection setup is now completed asynchronously in BH context,
in the function filter_connect(), the corresponding code in recv_msg()
becomes redundant.

Signed-off-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
  • Loading branch information
Ying Xue authored and Paul Gortmaker committed Dec 7, 2012
1 parent 584d24b commit cbab368
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions net/tipc/socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -946,13 +946,6 @@ static int recv_msg(struct kiocb *iocb, struct socket *sock,
sz = msg_data_sz(msg);
err = msg_errcode(msg);

/* Complete connection setup for an implied connect */
if (unlikely(sock->state == SS_CONNECTING)) {
res = auto_connect(sock, msg);
if (res)
goto exit;
}

/* Discard an empty non-errored message & try again */
if ((!sz) && (!err)) {
advance_rx_queue(sk);
Expand Down

0 comments on commit cbab368

Please sign in to comment.