diff mbox

[1/9] batman-adv: Create batman_if only on register event

Message ID 1281820085-13507-1-git-send-email-sven.eckelmann@gmx.de (mailing list archive)
State Accepted, archived
Headers

Commit Message

Sven Eckelmann Aug. 14, 2010, 9:07 p.m. UTC 
  We try to get all events for all net_devices to be able to add special
sysfs folders for the batman-adv configuration. This also includes such
events like NETDEV_POST_INIT which has no valid kobject according to
v2.6.32-rc3-13-g7ffbe3f. This would create an oops in that situation.

It is enough to create the batman_if only on NETDEV_REGISTER events
because we will also receive those events for devices which already
existed when we registered the notifier call.

Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Cc: stable <stable@kernel.org>
---
 batman-adv/hard-interface.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

Comments

Marek Lindner Aug. 20, 2010, 7:23 p.m. UTC | #1 
On Saturday 14 August 2010 23:07:57 Sven Eckelmann wrote:
> We try to get all events for all net_devices to be able to add special
> sysfs folders for the batman-adv configuration. This also includes such
> events like NETDEV_POST_INIT which has no valid kobject according to
> v2.6.32-rc3-13-g7ffbe3f. This would create an oops in that situation.

I applied all patches (revision 1769 - 1775)  except for patch 2 & 9. Linus is 
working on a fix for the netfilter stuff, so I'd rather wait for his 
patch/opinion. We might come back to your patch at a later point.

Thanks,
Marek
diff mbox

Patch

diff --git a/batman-adv/hard-interface.c b/batman-adv/hard-interface.c
index 1a829be..f481cbb 100644
--- a/batman-adv/hard-interface.c
+++ b/batman-adv/hard-interface.c
@@ -457,15 +457,13 @@  static int hard_if_event(struct notifier_block *this,
 	struct batman_if *batman_if = get_batman_if_by_netdev(net_dev);
 	struct bat_priv *bat_priv;
 
-	if (!batman_if)
-		batman_if = hardif_add_interface(net_dev);
+	if (!batman_if && event == NETDEV_REGISTER)
+			batman_if = hardif_add_interface(net_dev);
 
 	if (!batman_if)
 		goto out;
 
 	switch (event) {
-	case NETDEV_REGISTER:
-		break;
 	case NETDEV_UP:
 		hardif_activate_interface(batman_if);
 		break;