From: Geliang Tang <tanggeliang@kylinos.cn>

v3:
 - add a new argument addr for mptcp_lib_evts_get_info, instead of
   a new helper mptcp_lib_evts_get_info_with_addr

v2:
 - update selftests as Mat suggested.

Geliang Tang (2):
  mptcp: map v4 address to v6 when destroying subflow
  selftests: mptcp: rm subflow with v4/v4mapped addr

 net/mptcp/pm_userspace.c                      | 10 +++++++
 .../testing/selftests/net/mptcp/mptcp_join.sh | 28 +++++++++++--------
 .../testing/selftests/net/mptcp/mptcp_lib.sh  |  7 +++--
 3 files changed, 31 insertions(+), 14 deletions(-)

-- 
2.40.1

Hi Geliang, Mat,

On 07/02/2024 02:55, Geliang Tang wrote:
> From: Geliang Tang <tanggeliang@kylinos.cn>
> 
> v3:
>  - add a new argument addr for mptcp_lib_evts_get_info, instead of
>    a new helper mptcp_lib_evts_get_info_with_addr
> 
> v2:
>  - update selftests as Mat suggested.
> 
> Geliang Tang (2):
>   mptcp: map v4 address to v6 when destroying subflow
>   selftests: mptcp: rm subflow with v4/v4mapped addr

Thank you for the patches and the reviews!

Now in our tree (fixes for -net), with Mat and my RvB tags, and the
modification I mentioned in patch 2/2.

New patches for t/upstream-net and t/upstream:
- cc6b8f6f3d24: mptcp: map v4 address to v6 when destroying subflow
- bbc429327d25: selftests: mptcp: rm subflow with v4/v4mapped addr
- Results: 0675fccde951..abfdc616f556 (export-net)
- Results: f63a9c1dbbaa..ce1856db2249 (export)

Tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export-net/20240214T102432
https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20240214T102432

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.

On Wed, 7 Feb 2024, Geliang Tang wrote:

> From: Geliang Tang <tanggeliang@kylinos.cn>
>
> v3:
> - add a new argument addr for mptcp_lib_evts_get_info, instead of
>   a new helper mptcp_lib_evts_get_info_with_addr

v3 looks good to me, thanks Geliang.

Reviewed-by: Mat Martineau <martineau@kernel.org>

>
> v2:
> - update selftests as Mat suggested.
>
> Geliang Tang (2):
>  mptcp: map v4 address to v6 when destroying subflow
>  selftests: mptcp: rm subflow with v4/v4mapped addr
>
> net/mptcp/pm_userspace.c                      | 10 +++++++
> .../testing/selftests/net/mptcp/mptcp_join.sh | 28 +++++++++++--------
> .../testing/selftests/net/mptcp/mptcp_lib.sh  |  7 +++--
> 3 files changed, 31 insertions(+), 14 deletions(-)
>
> -- 
> 2.40.1
>
>
>