Here is a fix for an issue linked to something spot by Sashiko [1], even
if there was an issue even after the recent modification in how the out
options are initialised.

And another small fix, for net-next.

Link: https://sashiko.dev/#/patchset/20260601-mptcp-add-addr6-port-ts-fixes-v2-v1-0-d7c842e80446%40kernel.org?part=3 [1]
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
Matthieu Baerts (NGI0) (2):
      mptcp: add-addr: always drop other suboptions
      mptcp: options: rst: drop unused skb parameter

 net/mptcp/options.c  | 31 ++++++++-----------------------
 net/mptcp/pm.c       | 13 +++----------
 net/mptcp/protocol.h |  5 ++---
 3 files changed, 13 insertions(+), 36 deletions(-)
---
base-commit: 39cfd0474a57e23ae279c4e9227c1608693b858a
change-id: 20260602-mptcp-add-addr-always-drop-subopt-f9af6309c93d

Best regards,
--  
Matthieu Baerts (NGI0) <matttbe@kernel.org>

Hello,

On 02/06/2026 17:12, Matthieu Baerts (NGI0) wrote:
> Here is a fix for an issue linked to something spot by Sashiko [1], even
> if there was an issue even after the recent modification in how the out
> options are initialised.
> 
> And another small fix, for net-next.
I hope that's fine if I apply these patches and send them to netdev now,
so they can hopefully be applied before the next sync, to avoid
conflicts on net-next with future patches.

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

On 02/06/2026 21:24, Matthieu Baerts wrote:
> Hello,
> 
> On 02/06/2026 17:12, Matthieu Baerts (NGI0) wrote:
>> Here is a fix for an issue linked to something spot by Sashiko [1], even
>> if there was an issue even after the recent modification in how the out
>> options are initialised.
>>
>> And another small fix, for net-next.
> I hope that's fine if I apply these patches and send them to netdev now,
> so they can hopefully be applied before the next sync, to avoid
> conflicts on net-next with future patches.
And just applied:

New patches for t/upstream-net and t/upstream:
- 9f38dc531a21: mptcp: add-addr: always drop other suboptions (with
conflicts)
- Results: 6432a10e9ece..eac879c1e918 (export-net)
- 5b41a083470c: conflict in t/mptcp-pm-avoid-computing-rm_addr-size-twice
- 748780f95bc9: conflict in t/mptcp-pm-avoid-computing-add_addr-size-twice
- 479431e78400: conflict in t/mptcp-pm-drop-TCP-TS-with-ADD_ADDRv6-port
- Results: 611e80cf3a35..d52ceeaf058c (export)

Tests are now in progress:

- export-net:
https://github.com/multipath-tcp/mptcp_net-next/commit/6dd27e4cedbce421b040cbc8798cb456d9566f34/checks


New patches for t/upstream:
- 3758f20ba2e1: mptcp: options: rst: drop unused skb parameter
- Results: d52ceeaf058c..daefa9c068e1 (export)

Tests are now in progress:

- export:
https://github.com/multipath-tcp/mptcp_net-next/commit/0c8d473f43cfab0ed926d694c77cb7824893af04/checks

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

Hi Matthieu,

Thank you for your modifications, that's great!

Our CI did some validations and here is its report:

- KVM Validation: normal (except selftest_mptcp_join): Success! ✅
- KVM Validation: normal (only selftest_mptcp_join): Success! ✅
- KVM Validation: debug (except selftest_mptcp_join): Unstable: 1 failed test(s): selftest_mptcp_connect_checksum ⚠️ 
- KVM Validation: debug (only selftest_mptcp_join): Success! ✅
- KVM Validation: btf-normal (only bpftest_all): Success! ✅
- KVM Validation: btf-debug (only bpftest_all): Success! ✅
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/26805350984

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/6bf804b82108
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=1104427


If there are some issues, you can reproduce them using the same environment as
the one used by the CI thanks to a docker image, e.g.:

    $ cd [kernel source code]
    $ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
        --pull always mptcp/mptcp-upstream-virtme-docker:latest \
        auto-normal

For more details:

    https://github.com/multipath-tcp/mptcp-upstream-virtme-docker


Please note that despite all the efforts that have been already done to have a
stable tests suite when executed on a public CI like here, it is possible some
reported issues are not due to your modifications. Still, do not hesitate to
help us improve that ;-)

Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)