Skip to contentSkip to conversation

squash-to: Implement MPTCP receive path

PATCH In review Mat Martineau 2 participants 3 messages Jun 12, 2019 – Jun 13, 2019

Subsystems (3)
lore
Share & tools
lore

Mat Martineau

author
#0 lore raw

PATCH 1/1 squash-to: Implement MPTCP receive path

This MPTCP debug print is an unnecessary change to common TCP code, and it's best to get rid of it before upstream review.

Signed-off-by Mat Martineau <mathew.j.martineau(a)linux.intel.com>
---
 net/ipv4/tcp_output.c | 3 ---
 1 file changed, 3 deletions(-)
net/ipv4/tcp_output.c +0 -3
index 08675fd0f070..a850686b8e2a 100644
@@ -3707,9 +3707,6 @@ void __tcp_send_ack(struct sock *sk, u32 rcv_nxt)
 	skb_set_tcp_pure_ack(buff);
 
 	/* Send it off, this clears delayed acks for us. */
-	if (sk_is_mptcp(sk))
-		pr_debug("mptcp sk=%p", sk);
-
 	__tcp_transmit_skb(sk, buff, 0, (__force gfp_t)0, rcv_nxt);
 }
 EXPORT_SYMBOL_GPL(__tcp_send_ack);
Signature · 1 line
2.22.0
#1 lore raw

Hi Mat,

Quoted 2 lines · Mat Martineau

This MPTCP debug print is an unnecessary change to common TCP code, and it's best to get rid of it before upstream review.

Good idea and good catch!

It looks good to me.

I can apply this patch if there is no contradiction.

Cheers,
Matt

Signature · 5 lines
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
#2 lore raw

Hi Mat,

Quoted 9 lines · Matthieu Baerts

Hi Mat,

Quoted 2 lines · Mat Martineau

This MPTCP debug print is an unnecessary change to common TCP code, and it's best to get rid of it before upstream review.

Good idea and good catch!

It looks good to me.

Thank you for the patch!

- c0b5193e7959: "squashed" in "mptcp: Implement MPTCP receive path"
- signed-off was already there
- no conflict
- 1229232b4dcc..f39a7eb3a829: result

Cheers,
Matt

Signature · 5 lines
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