* [MPTCP] [PATCH 4/7] mptcp: reduce number of pr_debug() calls.
@ 2019-06-06 0:36 Peter Krystad
0 siblings, 0 replies; 2+ messages in thread
From: Peter Krystad @ 2019-06-06 0:36 UTC (permalink / raw)
To: mptcp
[-- Attachment #1: Type: text/plain, Size: 745 bytes --]
squash to: Implement MPTCP receive path
Signed-off-by: Peter Krystad <peter.krystad(a)linux.intel.com>
---
net/mptcp/protocol.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 78ce42b1617a..11b6855cc9ed 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -747,7 +747,7 @@ void mptcp_finish_connect(struct sock *sk, int mp_capable)
msk->remote_key = subflow->remote_key;
msk->local_key = subflow->local_key;
msk->token = subflow->token;
- pr_debug("token=%u", msk->token);
+ pr_debug("msk=%p, token=%u", msk, msk->token);
crypto_key_sha1(msk->remote_key, NULL, &ack_seq);
msk->write_seq = subflow->idsn + 1;
--
2.17.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [MPTCP] [PATCH 4/7] mptcp: reduce number of pr_debug() calls.
@ 2019-06-07 11:23 Matthieu Baerts
0 siblings, 0 replies; 2+ messages in thread
From: Matthieu Baerts @ 2019-06-07 11:23 UTC (permalink / raw)
To: mptcp
[-- Attachment #1: Type: text/plain, Size: 1818 bytes --]
Hi Peter, Paolo,
On 06/06/2019 02:36, Peter Krystad wrote:
> squash to: Implement MPTCP receive path
Thank you for the patch and the review!
- e2fd582aa5c1: "squash" in "mptcp: Implement MPTCP receive path": I
also added a diff from the previous patch (3/7), see below
- c1873d1e4ed6: signed-off
- 5d1039667868: "squash" (part 2) in "mptcp: accept: don't leak mptcp
socket structure"
- c4df6da5e7d3: conflict
- a9c9e1105ce0: conflict
- a053cbcf3dd5: conflict
- eec1d25d9283..612e3f6c26e6: result
> Signed-off-by: Peter Krystad <peter.krystad(a)linux.intel.com>
> ---
> net/mptcp/protocol.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
> index 78ce42b1617a..11b6855cc9ed 100644
> --- a/net/mptcp/protocol.c
> +++ b/net/mptcp/protocol.c
I also added this block from patch 3/7:
@@ -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;
Cheers,
Matt
> @@ -747,7 +747,7 @@ void mptcp_finish_connect(struct sock *sk, int mp_capable)
> msk->remote_key = subflow->remote_key;
> msk->local_key = subflow->local_key;
> msk->token = subflow->token;
> - pr_debug("token=%u", msk->token);
> + pr_debug("msk=%p, token=%u", msk, msk->token);
>
> crypto_key_sha1(msk->remote_key, NULL, &ack_seq);
> msk->write_seq = subflow->idsn + 1;
>
--
Matthieu Baerts | R&D Engineer
matthieu.baerts(a)tessares.net
Tessares SA | Hybrid Access Solutions
www.tessares.net
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-06-07 11:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-06 0:36 [MPTCP] [PATCH 4/7] mptcp: reduce number of pr_debug() calls Peter Krystad
2019-06-07 11:23 Matthieu Baerts
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.