shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

mptcp: pm: reduce indentation blocks

Browse Source 
commit c95eb32ced823a00be62202b43966b07b2f20b7f upstream.

That will simplify the following commits.

No functional changes intended.

Suggested-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20240731-upstream-net-20240731-mptcp-endp-subflow-signal-v1-3-c8a9b036493b@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Stable-dep-of: cd7c957f936f ("mptcp: pm: don't try to create sf if alloc failed")
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Matthieu Baerts (NGI0)
2024-08-13 11:28:18 +02:00
committed by Greg Kroah-Hartman
parent 316543e872
commit dc5e0fe135
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
net/mptcp/pm_netlink.c
View File

@@ -579,16 +579,19 @@ static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk)
if (msk->pm.addr_signal & BIT(MPTCP_ADD_ADDR_SIGNAL)) if (msk->pm.addr_signal & BIT(MPTCP_ADD_ADDR_SIGNAL))
return; return;
if (local) { if (!local)
if (mptcp_pm_alloc_anno_list(msk, &local->addr)) { goto subflow;
__clear_bit(local->addr.id, msk->pm.id_avail_bitmap);
msk->pm.add_addr_signaled++; if (!mptcp_pm_alloc_anno_list(msk, &local->addr))
mptcp_pm_announce_addr(msk, &local->addr, false); goto subflow;
mptcp_pm_nl_addr_send_ack(msk);
} __clear_bit(local->addr.id, msk->pm.id_avail_bitmap);
} msk->pm.add_addr_signaled++;
mptcp_pm_announce_addr(msk, &local->addr, false);
mptcp_pm_nl_addr_send_ack(msk);
} }
subflow:
/* check if should create a new subflow */ /* check if should create a new subflow */
while (msk->pm.local_addr_used < local_addr_max && while (msk->pm.local_addr_used < local_addr_max &&
msk->pm.subflows < subflows_max) { msk->pm.subflows < subflows_max) {