Commit 52913246 authored Jan 31, 2008 by Rami Rosen Committed by David S. Miller Jan 31, 2008

[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>

parent e83a2ea8

drivers/net/macvlan.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message