summaryrefslogtreecommitdiff
path: root/net/can
diff options
context:
space:
mode:
authorZiyang Xuan <william.xuanziyang@huawei.com>2022-08-27 10:20:10 +0300
committerMarc Kleine-Budde <mkl@pengutronix.de>2022-09-06 09:35:07 +0300
commitc28b3bffe49e713ce67f0e36de13b8f9f0776837 (patch)
tree983c2b86e1ef0819bdadded686fb5b7876e88999 /net/can
parent318d8235bcb8e9b6a42ce4a1190c23e577ed0833 (diff)
downloadlinux-c28b3bffe49e713ce67f0e36de13b8f9f0776837.tar.xz
can: raw: process optimization in raw_init()
Now, register notifier after register proto successfully. It can create raw socket and set socket options once register proto successfully, so it is possible missing notifier event before register notifier successfully although this is a low probability scenario. Move notifier registration to the front of proto registration like done in j1939. In addition, register_netdevice_notifier() may fail, check its result is necessary. Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com> Link: https://lore.kernel.org/all/7af9401f0d2d9fed36c1667b5ac9b8df8f8b87ee.1661584485.git.william.xuanziyang@huawei.com Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'net/can')
-rw-r--r--net/can/raw.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/net/can/raw.c b/net/can/raw.c
index d1bd9cc51ebe..9ae7c4206b9a 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -942,12 +942,20 @@ static __init int raw_module_init(void)
pr_info("can: raw protocol\n");
+ err = register_netdevice_notifier(&canraw_notifier);
+ if (err)
+ return err;
+
err = can_proto_register(&raw_can_proto);
- if (err < 0)
+ if (err < 0) {
pr_err("can: registration of raw protocol failed\n");
- else
- register_netdevice_notifier(&canraw_notifier);
+ goto register_proto_failed;
+ }
+ return 0;
+
+register_proto_failed:
+ unregister_netdevice_notifier(&canraw_notifier);
return err;
}