aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2012-11-29 03:28:30 -0500
committerPaul Gortmaker <paul.gortmaker@windriver.com>2012-12-07 17:23:22 -0500
commitcbab368790f23bc917d97fcf7a338c5ba5336ee0 (patch)
tree3aa28343e549d30135fd39202c41fa7e85e70b8e
parent584d24b3960e4c877fc623214815f278708f127c (diff)
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>
-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:
946 sz = msg_data_sz(msg); 946 sz = msg_data_sz(msg);
947 err = msg_errcode(msg); 947 err = msg_errcode(msg);
948 948
949 /* Complete connection setup for an implied connect */
950 if (unlikely(sock->state == SS_CONNECTING)) {
951 res = auto_connect(sock, msg);
952 if (res)
953 goto exit;
954 }
955
956 /* Discard an empty non-errored message & try again */ 949 /* Discard an empty non-errored message & try again */
957 if ((!sz) && (!err)) { 950 if ((!sz) && (!err)) {
958 advance_rx_queue(sk); 951 advance_rx_queue(sk);