Commit 2e3c5df2 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'mptcp-more-fixes-for-6-5' 

Mat Martineau says:

====================
mptcp: More fixes for 6.5

Patch 1: Better detection of ip6tables vs ip6tables-legacy tools for
self tests. Fix for 6.4 and newer.

Patch 2: Only generate "new listener" event if listen operation
succeeds. Fix for 6.2 and newer.
====================

Link: https://lore.kernel.org/r/20230725-send-net-20230725-v1-0-6f60fe7137a9@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents fa29d467 21d9b73a

net/mptcp/protocol.c

+1 −2
Original line number Diff line number Diff line
@@ -3723,9 +3723,8 @@ static int mptcp_listen(struct socket *sock, int backlog) 
	if (!err) {

		sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);

		mptcp_copy_inaddrs(sk, ssock->sk);

	}



		mptcp_event_pm_listener(ssock->sk, MPTCP_EVENT_LISTENER_CREATED);

	}



unlock:

	release_sock(sk);

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

+1 −3
Original line number Diff line number Diff line
@@ -162,9 +162,7 @@ check_tools() 
	elif ! iptables -V &> /dev/null; then

		echo "SKIP: Could not run all tests without iptables tool"

		exit $ksft_skip

	fi



	if ! ip6tables -V &> /dev/null; then

	elif ! ip6tables -V &> /dev/null; then

		echo "SKIP: Could not run all tests without ip6tables tool"

		exit $ksft_skip

	fi