netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: David Miller <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>, Jon Maloy <jon.maloy@ericsson.com>,
	Ying Xue <ying.xue@windriver.com>,
	Paul Gortmaker <paul.gortmaker@windriver.com>
Subject: [PATCH net-next 7/9] tipc: eliminate connection setup for implied connect in recv_msg()
Date: Fri, 7 Dec 2012 20:19:16 -0500	[thread overview]
Message-ID: <1354929558-16948-8-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1354929558-16948-1-git-send-email-paul.gortmaker@windriver.com>

From: Ying Xue <ying.xue@windriver.com>

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>
---
 net/tipc/socket.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index dbce274..ef75b62 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);
-- 
1.7.12.1

  parent reply	other threads:[~2012-12-08  1:19 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-08  1:19 [PATCH v2 net-next 0/9] tipc: more updates for the v3.8 content Paul Gortmaker
2012-12-08  1:19 ` [PATCH net-next 1/9] tipc: remove obsolete flush of stale reassembly buffer Paul Gortmaker
2012-12-08  1:19 ` [PATCH net-next 2/9] tipc: eliminate aggregate sk_receive_queue limit Paul Gortmaker
2012-12-08 14:07   ` Neil Horman
2012-12-08  1:19 ` [PATCH net-next 3/9] tipc: change sk_receive_queue upper limit Paul Gortmaker
2012-12-08  1:19 ` [PATCH net-next 4/9] tipc: standardize across connect/disconnect function naming Paul Gortmaker
2012-12-08  1:19 ` [PATCH net-next 5/9] tipc: consolidate connection-oriented message reception in one function Paul Gortmaker
2012-12-08  1:19 ` [PATCH net-next 6/9] tipc: introduce non-blocking socket connect Paul Gortmaker
2012-12-08  1:19 ` Paul Gortmaker [this message]
2012-12-08  1:19 ` [PATCH net-next 8/9] tipc: add lock nesting notation to quiet lockdep warning Paul Gortmaker
2012-12-08  1:19 ` [PATCH net-next 9/9] tipc: refactor accept() code for improved readability Paul Gortmaker
2012-12-09  1:26 ` [PATCH v2 net-next 0/9] tipc: more updates for the v3.8 content David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1354929558-16948-8-git-send-email-paul.gortmaker@windriver.com \
    --to=paul.gortmaker@windriver.com \
    --cc=davem@davemloft.net \
    --cc=jon.maloy@ericsson.com \
    --cc=netdev@vger.kernel.org \
    --cc=ying.xue@windriver.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).