diff options
| author | Rami Rosen <ramirose@gmail.com> | 2008-01-31 16:56:03 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-31 19:28:25 -0800 |
| commit | 52913246e0056c9c6215a778a3b31b6b9ce5c3ef (patch) | |
| tree | 2540abf67d1bd59ab28a06487d424d3d658f6c95 | |
| parent | e83a2ea850bf0c0c81c675444080970fc07798c6 (diff) | |
| download | talos-obmc-linux-52913246e0056c9c6215a778a3b31b6b9ce5c3ef.tar.gz talos-obmc-linux-52913246e0056c9c6215a778a3b31b6b9ce5c3ef.zip | |
[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>
| -rw-r--r-- | drivers/net/macvlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 6ef6b8b39e71..f651a816b280 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; } |
