Commit 78dd8ad6 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'mptcp-misc-fixes-for-v6-17-rc6' 

Matthieu Baerts says:

====================
mptcp: misc fixes for v6.17-rc6

Here are various unrelated fixes:

- Patch 1: Fix a wrong attribute type in the MPTCP Netlink specs. A fix
  for v6.7.

- Patch 2: Avoid mentioning a deprecated MPTCP sysctl knob in the doc. A
  fix for v6.15.

- Patch 3: Handle new warnings from ShellCheck v0.11.0. This prevents
  some warnings reported by some CIs. If it is not a good material for
  'net', please drop.
====================

Link: https://patch.msgid.link/20250908-net-mptcp-misc-fixes-6-17-rc5-v1-0-5f2168a66079@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 648de374 ef1bd93b

Documentation/netlink/specs/mptcp_pm.yaml

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ attribute-sets: 
        type: u32

      -

        name: if-idx

        type: u32

        type: s32

      -

        name: reset-reason

        type: u32

Documentation/networking/mptcp.rst

+4 −4
Original line number Diff line number Diff line
@@ -60,10 +60,10 @@ address announcements. Typically, it is the client side that initiates subflows, 
and the server side that announces additional addresses via the ``ADD_ADDR`` and

``REMOVE_ADDR`` options.



Path managers are controlled by the ``net.mptcp.pm_type`` sysctl knob -- see

mptcp-sysctl.rst. There are two types: the in-kernel one (type ``0``) where the

same rules are applied for all the connections (see: ``ip mptcp``) ; and the

userspace one (type ``1``), controlled by a userspace daemon (i.e. `mptcpd

Path managers are controlled by the ``net.mptcp.path_manager`` sysctl knob --

see mptcp-sysctl.rst. There are two types: the in-kernel one (``kernel``) where

the same rules are applied for all the connections (see: ``ip mptcp``) ; and the

userspace one (``userspace``), controlled by a userspace daemon (i.e. `mptcpd

<https://mptcpd.mptcp.dev/>`_) where different rules can be applied for each

connection. The path managers can be controlled via a Netlink API; see

netlink_spec/mptcp_pm.rst.

tools/testing/selftests/net/mptcp/diag.sh

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ flush_pids() 
}



# This function is used in the cleanup trap

#shellcheck disable=SC2317

#shellcheck disable=SC2317,SC2329

cleanup()

{

	ip netns pids "${ns}" | xargs --no-run-if-empty kill -SIGKILL &>/dev/null

tools/testing/selftests/net/mptcp/mptcp_connect.sh

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ ns4="" 
TEST_GROUP=""



# This function is used in the cleanup trap

#shellcheck disable=SC2317

#shellcheck disable=SC2317,SC2329

cleanup()

{

	rm -f "$cin_disconnect"

tools/testing/selftests/net/mptcp/mptcp_join.sh

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


# ShellCheck incorrectly believes that most of the code here is unreachable

# because it's invoked by variable name, see how the "tests" array is used

#shellcheck disable=SC2317

#shellcheck disable=SC2317,SC2329



. "$(dirname "${0}")/mptcp_lib.sh"