diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-05-16 23:11:33 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-05-16 23:11:34 +0300 |
| commit | 2ba5c8163038bcbac34540d9ecae574d390a031f (patch) | |
| tree | 0ddbad7159c0d87c17f44a26723f4e56084e4328 /tools | |
| parent | f008f8d0305cdf930de97d4f746f2a6bc9338385 (diff) | |
| parent | ea1e301d04b7dc47e9e25ebba461c397f4d4e767 (diff) | |
| download | linux-2ba5c8163038bcbac34540d9ecae574d390a031f.tar.xz | |
Merge branch 'mptcp-updates-for-net-next'
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>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/testing/selftests/net/mptcp/mptcp_join.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh index d1de1e7702fb..7381d1f85209 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2693,6 +2693,7 @@ fastclose_tests() pedit_action_pkts() { tc -n $ns2 -j -s action show action pedit index 100 | \ + grep "packets" | \ sed 's/.*"packets":\([0-9]\+\),.*/\1/' } |