Commit c07cc3ed authored by Matthieu Baerts (NGI0)'s avatar Matthieu Baerts (NGI0) Committed by Paolo Abeni
Browse files

mptcp: pm: send ACK on an active subflow 



Taking the first one on the list doesn't work in some cases, e.g. if the
initial subflow is being removed. Pick another one instead of not
sending anything.

Fixes: 84dfe367 ("mptcp: send out dedicated ADD_ADDR packet")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarMat Martineau <martineau@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 5f94b08c

net/mptcp/pm_netlink.c

+6 −3
Original line number Diff line number Diff line
@@ -765,9 +765,12 @@ void mptcp_pm_nl_addr_send_ack(struct mptcp_sock *msk) 
	    !mptcp_pm_should_rm_signal(msk))

		return;



	subflow = list_first_entry_or_null(&msk->conn_list, typeof(*subflow), node);

	if (subflow)

	mptcp_for_each_subflow(msk, subflow) {

		if (__mptcp_subflow_active(subflow)) {

			mptcp_pm_send_ack(msk, subflow, false, false);

			break;

		}

	}

}



int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk,