Commit b5a7acd3 authored by Geliang Tang's avatar Geliang Tang Committed by Jakub Kicinski
Browse files

mptcp: send ack for every add_addr 

This patch changes the sending ACK conditions for the ADD_ADDR, send an
ACK packet for any ADD_ADDR, not just when ipv6 addresses or port
numbers are included.

Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/139


Acked-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarGeliang Tang <geliangtang@gmail.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 875b7671

net/mptcp/pm.c

+1 −2
Original line number Diff line number Diff line
@@ -191,8 +191,7 @@ void mptcp_pm_add_addr_received(struct mptcp_sock *msk, 


void mptcp_pm_add_addr_send_ack(struct mptcp_sock *msk)

{

	if (!mptcp_pm_should_add_signal_ipv6(msk) &&

	    !mptcp_pm_should_add_signal_port(msk))

	if (!mptcp_pm_should_add_signal(msk))

		return;



	mptcp_pm_schedule_work(msk, MPTCP_PM_ADD_ADDR_SEND_ACK);

net/mptcp/pm_netlink.c

+4 −6
Original line number Diff line number Diff line
@@ -474,8 +474,7 @@ void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk) 
{

	struct mptcp_subflow_context *subflow;



	if (!mptcp_pm_should_add_signal_ipv6(msk) &&

	    !mptcp_pm_should_add_signal_port(msk))

	if (!mptcp_pm_should_add_signal(msk))

		return;



	__mptcp_flush_join_list(msk);
@@ -485,10 +484,9 @@ void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk) 
		u8 add_addr;



		spin_unlock_bh(&msk->pm.lock);

		if (mptcp_pm_should_add_signal_ipv6(msk))

			pr_debug("send ack for add_addr6");

		if (mptcp_pm_should_add_signal_port(msk))

			pr_debug("send ack for add_addr_port");

		pr_debug("send ack for add_addr%s%s",

			 mptcp_pm_should_add_signal_ipv6(msk) ? " [ipv6]" : "",

			 mptcp_pm_should_add_signal_port(msk) ? " [port]" : "");



		lock_sock(ssk);

		tcp_send_ack(ssk);