This are updates to the tx refactor patches as asked by Eric.
Note that patch 3/3 should replace completely the existing
'Partially revert "tcp: factor out tcp_build_frag()"'
patch. I opted for this solution as the git repo mangling looked
easier this way; @matttbe: please tell me if other options are
preferred instead.

Additionally patch "chtls: rename skb_entail() to chtls_skb_entail()"
should be dropped.

v1 -> v2:
 - drop unintended chunk in patch 3/3 [mat]
---
 include/net/tcp.h | 2 +-
 net/ipv4/tcp.c    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

-- 
2.26.3

On Tue, 21 Sep 2021, Paolo Abeni wrote:

> This are updates to the tx refactor patches as asked by Eric.
> Note that patch 3/3 should replace completely the existing
> 'Partially revert "tcp: factor out tcp_build_frag()"'
> patch. I opted for this solution as the git repo mangling looked
> easier this way; @matttbe: please tell me if other options are
> preferred instead.
>
> Additionally patch "chtls: rename skb_entail() to chtls_skb_entail()"
> should be dropped.
>
> v1 -> v2:
> - drop unintended chunk in patch 3/3 [mat]
> ---
> include/net/tcp.h | 2 +-
> net/ipv4/tcp.c    | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)
>

Thanks for the v2, these are ready to apply.

--
Mat Martineau
Intel

Hi Paolo, Mat,

On 21/09/2021 13:39, Paolo Abeni wrote:
> This are updates to the tx refactor patches as asked by Eric.
> Note that patch 3/3 should replace completely the existing
> 'Partially revert "tcp: factor out tcp_build_frag()"'
> patch. I opted for this solution as the git repo mangling looked
> easier this way; @matttbe: please tell me if other options are
> preferred instead.
> 
> Additionally patch "chtls: rename skb_entail() to chtls_skb_entail()"
> should be dropped.
> 
> v1 -> v2:
>  - drop unintended chunk in patch 3/3 [mat]
> ---
>  include/net/tcp.h | 2 +-
>  net/ipv4/tcp.c    | 6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)

Thank you for the patches and the reviews!

I just reverted the original series (5 patches) and sync with net-next
(4+1 patches are already there).

Builds and tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20210923T163341
https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export/20210923T163341

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net