Commit cbab3687 authored by Ying Xue's avatar Ying Xue Committed by Paul Gortmaker
Browse files

tipc: eliminate connection setup for implied connect in recv_msg() 



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: default avatarYing Xue <ying.xue@windriver.com>
Signed-off-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent 584d24b3

net/tipc/socket.c

+0 −7
Original line number Diff line number Diff line
@@ -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);