mptcp: fix fallback MIB counter and wrong var in selftests

[PATCH net 0/2] mptcp: fix fallback MIB counter and wrong var in selftests

Matthieu Baerts (NGI0) posted 2 patches 1 month ago

Download series mbox

Failed in applying to current master (apply log)

net/mptcp/protocol.c                               | 2 --
net/mptcp/subflow.c                                | 2 ++
tools/testing/selftests/net/mptcp/mptcp_connect.sh | 9 +++++++++
tools/testing/selftests/net/mptcp/mptcp_join.sh    | 4 +++-
4 files changed, 14 insertions(+), 3 deletions(-)

Expand all Fold all

[PATCH net 0/2] mptcp: fix fallback MIB counter and wrong var in selftests

Posted by Matthieu Baerts (NGI0) 1 month ago

Here are two fixes related to MPTCP.

The first patch fixes when the MPTcpExtMPCapableFallbackACK MIB counter
is modified: it should only be incremented when a connection was using
MPTCP options, but then a fallback to TCP has been done. This patch also
checks the counter is not incremented by mistake during the connect
selftests. This counter was wrongly incremented since its introduction
in v5.7.

The second patch fixes a wrong parsing of the 'dev' endpoint options in
the selftests: the wrong variable was used. This option was not used
before, but it is going to be soon. This issue is visible since v5.18.

Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
Davide Caratti (1):
      mptcp: don't account accept() of non-MPC client as fallback to TCP

Geliang Tang (1):
      selftests: mptcp: join: fix dev in check_endpoint

 net/mptcp/protocol.c                               | 2 --
 net/mptcp/subflow.c                                | 2 ++
 tools/testing/selftests/net/mptcp/mptcp_connect.sh | 9 +++++++++
 tools/testing/selftests/net/mptcp/mptcp_join.sh    | 4 +++-
 4 files changed, 14 insertions(+), 3 deletions(-)
---
base-commit: 0ba80d96585662299d4ea4624043759ce9015421
change-id: 20240329-upstream-net-20240329-fallback-mib-b0fec9c6189b

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