[B.A.T.M.A.N.] [PATCH] batman-adv: Call unregister_netdev on failures to get rtnl lock

[B.A.T.M.A.N.] [PATCH] batman-adv: Call unregister_netdev on failures to get rtnl lock

[Sven Eckelmann]

We must call unregister_netdev when we couldn't initialise the
batman-adv module and the soft_device was registered. There are two
version of the function which we can use:
 * unregister_netdevice - removes device
 * unregister_netdev - takes rtnl semaphore and remove device

We don't hold the semaphore in a error case. So we must use
unregister_netdev.

Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
---
 batman-adv-kernelland/main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/batman-adv-kernelland/main.c b/batman-adv-kernelland/main.c
index cbabba6..51856a7 100644
--- a/batman-adv-kernelland/main.c
+++ b/batman-adv-kernelland/main.c
@@ -129,7 +129,7 @@ int init_module(void)
 unreg_sysfs:
 	sysfs_del_meshif(soft_device);
 unreg_soft_device:
-	unregister_netdevice(soft_device);
+	unregister_netdev(soft_device);
 free_soft_device:
 	free_netdev(soft_device);
 	soft_device = NULL;
-- 
1.7.1

[B.A.T.M.A.N.] [PATCH-maint] batman-adv: Call unregister_netdev on failures to get rtnl lock

[Sven Eckelmann]

We must call unregister_netdev when we couldn't initialise the
batman-adv module and the soft_device was registered. There are two
version of the function which we can use:
 * unregister_netdevice - removes device
 * unregister_netdev - takes rtnl semaphore and remove device

We don't hold the semaphore in a error case. So we must use
unregister_netdev.

Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
---
This patch is created for maint and should be applied using `git am`.
Following patches should be applied before:
 * batman-adv: Move device for icmp injection to debugfs
 * batman-adv: Move tables from sysfs to debugfs

 main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/main.c b/main.c
index 770625f..6e6d925 100644
--- a/main.c
+++ b/main.c
@@ -137,7 +137,7 @@ int init_module(void)
 unreg_sysfs:
 	sysfs_del_meshif(soft_device);
 unreg_soft_device:
-	unregister_netdevice(soft_device);
+	unregister_netdev(soft_device);
 free_soft_device:
 	free_netdev(soft_device);
 	soft_device = NULL;
-- 
1.7.1

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: Call unregister_netdev on failures to get rtnl lock

[Marek Lindner]

On Wednesday 19 May 2010 19:43:48 Sven Eckelmann wrote:
> We must call unregister_netdev when we couldn't initialise the
> batman-adv module and the soft_device was registered. There are two
> version of the function which we can use:
>  * unregister_netdevice - removes device
>  * unregister_netdev - takes rtnl semaphore and remove device
> 
> We don't hold the semaphore in a error case. So we must use
> unregister_netdev

Applied in revision 1665.

Thanks,
Marek