]> git.dujemihanovic.xyz Git - linux.git/commitdiff
mptcp: pm: reduce indentation blocks
authorMatthieu Baerts (NGI0) <matttbe@kernel.org>
Wed, 31 Jul 2024 11:05:55 +0000 (13:05 +0200)
committerJakub Kicinski <kuba@kernel.org>
Fri, 2 Aug 2024 01:24:48 +0000 (18:24 -0700)
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>
net/mptcp/pm_netlink.c

index c921d07e59404f23542b41d2485756a8bbafd6b1..780f4cca165c377b63c1dec6d602bb21e558292a 100644 (file)
@@ -567,16 +567,19 @@ static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk)
                if (msk->pm.addr_signal & BIT(MPTCP_ADD_ADDR_SIGNAL))
                        return;
 
-               if (local) {
-                       if (mptcp_pm_alloc_anno_list(msk, &local->addr)) {
-                               __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);
-                       }
-               }
+               if (!local)
+                       goto subflow;
+
+               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++;
+               mptcp_pm_announce_addr(msk, &local->addr, false);
+               mptcp_pm_nl_addr_send_ack(msk);
        }
 
+subflow:
        /* check if should create a new subflow */
        while (msk->pm.local_addr_used < local_addr_max &&
               msk->pm.subflows < subflows_max) {