[MPTCP] [PATCH 2/7] mptcp: reduce number of pr_debug() calls.

[Peter Krystad <peter.krystad at linux.intel.com>]

[-- Attachment #1: Type: text/plain, Size: 2191 bytes --]

squash to: Handle MP_CAPABLE options for outgoing connections

Signed-off-by: Peter Krystad <peter.krystad(a)linux.intel.com>
---
 net/mptcp/options.c  | 5 ++---
 net/mptcp/protocol.c | 2 --
 net/mptcp/subflow.c  | 5 ++---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 964e73b6b48b..7475c1d5c15f 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -250,15 +250,14 @@ bool mptcp_established_options(struct sock *sk, unsigned int *size,
 {
 	struct subflow_context *subflow = subflow_ctx(sk);
 
-	pr_debug("subflow=%p", subflow);
 	if (subflow->mp_capable && !subflow->fourth_ack) {
 		opts->suboptions = OPTION_MPTCP_MPC_ACK;
 		opts->sndr_key = subflow->local_key;
 		opts->rcvr_key = subflow->remote_key;
 		*size = TCPOLEN_MPTCP_MPC_ACK;
 		subflow->fourth_ack = 1;
-		pr_debug("local_key=%llu", subflow->local_key);
-		pr_debug("remote_key=%llu", subflow->remote_key);
+		pr_debug("subflow=%p, local_key=%llu, remote_key=%llu",
+			 subflow, subflow->local_key, subflow->remote_key);
 		return true;
 	}
 	return false;
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 4e809719dcfd..902b6c994f00 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -721,8 +721,6 @@ void mptcp_finish_connect(struct sock *sk, int mp_capable)
 	struct mptcp_sock *msk = mptcp_sk(sk);
 	struct subflow_context *subflow = subflow_ctx(msk->subflow->sk);
 
-	pr_debug("msk=%p", msk);
-
 	if (mp_capable) {
 		u64 ack_seq;
 
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 1b8ec517c687..829c97c57745 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -80,10 +80,9 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb)
 
 	inet_sk_rx_dst_set(sk, skb);
 
-	pr_debug("subflow=%p", subflow_ctx(sk));
-
 	if (subflow->conn && !subflow->conn_finished) {
-		pr_debug("remote_key=%llu", subflow->remote_key);
+		pr_debug("subflow=%p, remote_key=%llu", subflow_ctx(sk),
+			 subflow->remote_key);
 		mptcp_finish_connect(subflow->conn, subflow->mp_capable);
 		subflow->conn_finished = 1;
 
-- 
2.17.2