summaryrefslogtreecommitdiff
path: root/net/mpls
diff options
context:
space:
mode:
authorKuniyuki Iwashima <kuniyu@amazon.com>2024-10-16 11:53:56 -0700
committerPaolo Abeni <pabeni@redhat.com>2024-10-22 11:02:05 +0200
commit26eebdc4b005ccd4cf63f4fef4c9c0adf9bfa380 (patch)
tree68197c23878e90e65c85ff525de86ddc8b6089c9 /net/mpls
parenta0b63c6457e100b84b1ff9179bc328c0924de75c (diff)
downloadlinux-next-26eebdc4b005ccd4cf63f4fef4c9c0adf9bfa380.tar.gz
linux-next-26eebdc4b005ccd4cf63f4fef4c9c0adf9bfa380.zip
rtnetlink: Return int from rtnl_af_register().
The next patch will add init_srcu_struct() in rtnl_af_register(), then we need to handle its error. Let's add the error handling in advance to make the following patch cleaner. Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com> Reviewed-by: Matt Johnston <matt@codeconstruct.com.au> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'net/mpls')
-rw-r--r--net/mpls/af_mpls.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
index a0573847bc55..1f63b32d76d6 100644
--- a/net/mpls/af_mpls.c
+++ b/net/mpls/af_mpls.c
@@ -2753,7 +2753,9 @@ static int __init mpls_init(void)
dev_add_pack(&mpls_packet_type);
- rtnl_af_register(&mpls_af_ops);
+ err = rtnl_af_register(&mpls_af_ops);
+ if (err)
+ goto out_unregister_dev_type;
err = rtnl_register_many(mpls_rtnl_msg_handlers);
if (err)
@@ -2773,6 +2775,7 @@ out_unregister_rtnl:
rtnl_unregister_many(mpls_rtnl_msg_handlers);
out_unregister_rtnl_af:
rtnl_af_unregister(&mpls_af_ops);
+out_unregister_dev_type:
dev_remove_pack(&mpls_packet_type);
out_unregister_pernet:
unregister_pernet_subsys(&mpls_net_ops);