diff mbox series

Squash-to: "mptcp: Implement MPTCP receive path"

Message ID 6c8a763ddc3d9110354a197ab9b1f0f2aace020e.1576531786.git.pabeni@redhat.com
State Accepted, archived
Delegated to: Matthieu Baerts
Headers show
Series Squash-to: "mptcp: Implement MPTCP receive path" | expand

Commit Message

Paolo Abeni Dec. 16, 2019, 9:29 p.m. UTC 
drop duplicate line indroduced by the 'Squash-to' commit.

Note: this will cause some conflict in v1 patches. Resolution
is trivial, howver the patches must be rebased on top of this
one.
---
 net/mptcp/protocol.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Matthieu Baerts Dec. 17, 2019, 6:35 p.m. UTC | #1 
Hi Paolo,

On 16/12/2019 22:29, Paolo Abeni wrote:
> drop duplicate line indroduced by the 'Squash-to' commit.
> 
> Note: this will cause some conflict in v1 patches. Resolution
> is trivial, howver the patches must be rebased on top of this
> one.

Good catch but your prediction seems wrong, no conflicts!

- 77b04716a417: "squashed" in "mptcp: Implement MPTCP receive path"
- 63ed4f5b07f4..3b9cd12db9d1: empty but expected, right?

Cheers,
Matt
diff mbox series

Patch

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 1ede654057ba..5b73a1ae0da9 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -559,8 +559,6 @@  void mptcp_finish_connect(struct sock *ssk)
 	subflow->map_subflow_seq = 1;
 	subflow->rel_write_seq = 1;
 
-	subflow->rel_write_seq = 1;
-
 	/* the socket is not connected yet, no msk/subflow ops can access/race
 	 * accessing the field below
 	 */