Skip to content

Commit a94f269

Browse files
matttbegregkh
authored andcommitted
mptcp: pm: reduce indentation blocks
commit c95eb32 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: cd7c957 ("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>
1 parent 9417df6 commit a94f269

1 file changed

Lines changed: 11 additions & 8 deletions

File tree

net/mptcp/pm_netlink.c

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -567,16 +567,19 @@ static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk)
567567
if (msk->pm.addr_signal & BIT(MPTCP_ADD_ADDR_SIGNAL))
568568
return;
569569

570-
if (local) {
571-
if (mptcp_pm_alloc_anno_list(msk, &local->addr)) {
572-
__clear_bit(local->addr.id, msk->pm.id_avail_bitmap);
573-
msk->pm.add_addr_signaled++;
574-
mptcp_pm_announce_addr(msk, &local->addr, false);
575-
mptcp_pm_nl_addr_send_ack(msk);
576-
}
577-
}
570+
if (!local)
571+
goto subflow;
572+
573+
if (!mptcp_pm_alloc_anno_list(msk, &local->addr))
574+
goto subflow;
575+
576+
__clear_bit(local->addr.id, msk->pm.id_avail_bitmap);
577+
msk->pm.add_addr_signaled++;
578+
mptcp_pm_announce_addr(msk, &local->addr, false);
579+
mptcp_pm_nl_addr_send_ack(msk);
578580
}
579581

582+
subflow:
580583
/* check if should create a new subflow */
581584
while (msk->pm.local_addr_used < local_addr_max &&
582585
msk->pm.subflows < subflows_max) {

0 commit comments

Comments
 (0)