summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2012-11-29 16:28:30 +0800
committerPaul Gortmaker <paul.gortmaker@windriver.com>2012-12-07 17:23:22 -0500
commitcbab368790f23bc917d97fcf7a338c5ba5336ee0 (patch)
tree3aa28343e549d30135fd39202c41fa7e85e70b8e /net
parent584d24b3960e4c877fc623214815f278708f127c (diff)
downloadlinux-cbab368790f23bc917d97fcf7a338c5ba5336ee0.tar.gz
linux-cbab368790f23bc917d97fcf7a338c5ba5336ee0.tar.bz2
linux-cbab368790f23bc917d97fcf7a338c5ba5336ee0.zip
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: Ying Xue <ying.xue@windriver.com> Signed-off-by: Jon Maloy <jon.maloy@ericsson.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/tipc/socket.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index dbce2745f0a8..ef75b6270247 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -946,13 +946,6 @@ restart:
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);