Merge branch 'mptcp-updates-for-net-next'

Browse source

Mat Martineau says:

====================
mptcp: Updates for net-next

Three independent fixes/features from the MPTCP tree:

Patch 1 is a selftest workaround for older iproute2 packages.

Patch 2 removes superfluous locks that were added with recent MP_FAIL
patches.

Patch 3 adds support for the TCP_DEFER_ACCEPT sockopt.
====================

Link: https://lore.kernel.org/r/20220514002115.725976-1-mathew.j.martineau@linux.intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

...

This commit is contained in:

Jakub Kicinski 2022-05-16 13:11:33 -07:00

parent f008f8d030 ea1e301d04

commit 2ba5c81630

3 changed files with 16 additions and 12 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

12

net/mptcp/protocol.c

View file

15

net/mptcp/sockopt.c

View file

1

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

View file