From: Peter Krystad <peter.krystad at linux.intel.com>
To: mptcp at lists.01.org
Subject: [MPTCP] [PATCH 3/7] mptcp: reduce number of pr_debug() calls.
Date: Wed, 05 Jun 2019 17:36:28 -0700 [thread overview]
Message-ID: <20190606003632.2863-4-peter.krystad@linux.intel.com> (raw)
In-Reply-To: 20190606003632.2863-1-peter.krystad@linux.intel.com
[-- Attachment #1: Type: text/plain, Size: 1968 bytes --]
squash to: Create SUBFLOW socket for incoming connections
Signed-off-by: Peter Krystad <peter.krystad(a)linux.intel.com>
---
net/mptcp/options.c | 6 +++---
net/mptcp/protocol.c | 5 +----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 7475c1d5c15f..b259c4343f36 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -339,14 +339,14 @@ bool mptcp_synack_options(const struct request_sock *req, unsigned int *size,
{
struct subflow_request_sock *subflow_req = subflow_rsk(req);
- pr_debug("subflow_req=%p", subflow_req);
if (subflow_req->mp_capable) {
opts->suboptions = OPTION_MPTCP_MPC_SYNACK;
opts->sndr_key = subflow_req->local_key;
opts->rcvr_key = subflow_req->remote_key;
*size = TCPOLEN_MPTCP_MPC_SYNACK;
- pr_debug("local_key=%llu", subflow_req->local_key);
- pr_debug("remote_key=%llu", subflow_req->remote_key);
+ pr_debug("subflow_req=%p, local_key=%llu, remote_key=%llu",
+ subflow_req, subflow_req->local_key,
+ subflow_req->remote_key);
return true;
}
return false;
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 902b6c994f00..78ce42b1617a 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -596,9 +596,7 @@ static struct sock *mptcp_accept(struct sock *sk, int flags, int *err,
return NULL;
subflow = subflow_ctx(new_sock->sk);
- pr_debug("new subflow=%p", subflow);
-
- pr_debug("new msk=%p", msk);
+ pr_debug("msk=%p, new subflow=%p, ", msk, subflow);
if (subflow->mp_capable) {
struct sock *new_mptcp_sock;
@@ -623,7 +621,6 @@ static struct sock *mptcp_accept(struct sock *sk, int flags, int *err,
msk->remote_key = subflow->remote_key;
msk->local_key = subflow->local_key;
msk->token = subflow->token;
- pr_debug("token=%u", msk->token);
token_update_accept(new_sock->sk, new_mptcp_sock);
msk->subflow = NULL;
--
2.17.2
next reply other threads:[~2019-06-06 0:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-06 0:36 Peter Krystad [this message]
2019-06-07 11:23 [MPTCP] [PATCH 3/7] mptcp: reduce number of pr_debug() calls Matthieu Baerts
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=20190606003632.2863-4-peter.krystad@linux.intel.com \
--to=unknown@example.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.