]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
sctp: make sctp_transport_init() void
authorHuiwen He <hehuiwen@kylinos.cn>
Mon, 3 Nov 2025 02:36:19 +0000 (10:36 +0800)
committerJakub Kicinski <kuba@kernel.org>
Tue, 4 Nov 2025 01:23:53 +0000 (17:23 -0800)
sctp_transport_init() is static and never returns NULL. It is only
called by sctp_transport_new(), so change it to void and remove the
redundant return value check.

Signed-off-by: Huiwen He <hehuiwen@kylinos.cn>
Acked-by: Xin Long <lucien.xin@gmail.com>
Link: https://patch.msgid.link/20251103023619.1025622-1-hehuiwen@kylinos.cn
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/sctp/transport.c

index 4d258a6e8033cb52a2899451540c178ce9c97911..0d48c61fe6adefc1a9c56ca1b8ab00072825d9e6 100644 (file)
 /* 1st Level Abstractions.  */
 
 /* Initialize a new transport from provided memory.  */
-static struct sctp_transport *sctp_transport_init(struct net *net,
-                                                 struct sctp_transport *peer,
-                                                 const union sctp_addr *addr,
-                                                 gfp_t gfp)
+static void sctp_transport_init(struct net *net,
+                               struct sctp_transport *peer,
+                               const union sctp_addr *addr,
+                               gfp_t gfp)
 {
        /* Copy in the address.  */
        peer->af_specific = sctp_get_af_specific(addr->sa.sa_family);
@@ -83,8 +83,6 @@ static struct sctp_transport *sctp_transport_init(struct net *net,
        get_random_bytes(&peer->hb_nonce, sizeof(peer->hb_nonce));
 
        refcount_set(&peer->refcnt, 1);
-
-       return peer;
 }
 
 /* Allocate and initialize a new transport.  */
@@ -96,20 +94,13 @@ struct sctp_transport *sctp_transport_new(struct net *net,
 
        transport = kzalloc(sizeof(*transport), gfp);
        if (!transport)
-               goto fail;
+               return NULL;
 
-       if (!sctp_transport_init(net, transport, addr, gfp))
-               goto fail_init;
+       sctp_transport_init(net, transport, addr, gfp);
 
        SCTP_DBG_OBJCNT_INC(transport);
 
        return transport;
-
-fail_init:
-       kfree(transport);
-
-fail:
-       return NULL;
 }
 
 /* This transport is no longer needed.  Free up if possible, or