From: Rami Rosen <ramirose@gmail.com>
Date: Fri, 1 Feb 2008 00:56:03 +0000 (-0800)
Subject: [MACVLAN]: Setting macvlan_handle_frame_hook to NULL when rtnl_link_register() fails.
X-Git-Tag: v2.6.25-rc1~1089^2~22
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52913246e0056c9c6215a778a3b31b6b9ce5c3ef;p=linux-2.6

[MACVLAN]: Setting macvlan_handle_frame_hook to NULL when rtnl_link_register() fails.

In drivers/net/macvlan.c, when rtnl_link_register() fails in
macvlan_init_module(), there is no point to set it (second time in
this method) to macvlan_handle_frame; macvlan_init_module() will
return a negative number, so instead this patch sets
macvlan_handle_frame_hook to NULL.

Signed-off-by: Rami Rosen <ramirose@gmail.com>
Acked-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 6ef6b8b39e..f651a816b2 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -508,7 +508,7 @@ static int __init macvlan_init_module(void)
 		goto err1;
 	return 0;
 err1:
-	macvlan_handle_frame_hook = macvlan_handle_frame;
+	macvlan_handle_frame_hook = NULL;
 	unregister_netdevice_notifier(&macvlan_notifier_block);
 	return err;
 }