diff options
| author | Sven Eckelmann <sven@narfation.org> | 2012-05-12 02:09:31 +0200 |
|---|---|---|
| committer | Antonio Quartulli <ordex@autistici.org> | 2012-06-20 22:15:20 +0200 |
| commit | 9563877ea52ea18bb4f1ed724c5e3a39bbbcf60b (patch) | |
| tree | 56bd2312e4aa7d04b448edd1d8ed87309c941f80 /net/batman-adv/main.c | |
| parent | 84d5e5e003752bc56b413f8d2c3fcfeeec066145 (diff) | |
| download | linux-3.10-9563877ea52ea18bb4f1ed724c5e3a39bbbcf60b.tar.gz linux-3.10-9563877ea52ea18bb4f1ed724c5e3a39bbbcf60b.tar.bz2 linux-3.10-9563877ea52ea18bb4f1ed724c5e3a39bbbcf60b.zip | |
batman-adv: Prefix hard-interface non-static functions with batadv_
batman-adv can be compiled as part of the kernel instead of an module. In that
case the linker will see all non-static symbols of batman-adv and all other
non-static symbols of the kernel. This could lead to symbol collisions. A
prefix for the batman-adv symbols that defines their private namespace avoids
such a problem.
Reported-by: David Miller <davem@davemloft.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv/main.c')
| -rw-r--r-- | net/batman-adv/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 8fe70b487b4..8e408361252 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -68,7 +68,7 @@ static int __init batman_init(void) bat_socket_init(); batadv_debugfs_init(); - register_netdevice_notifier(&hard_if_notifier); + register_netdevice_notifier(&batadv_hard_if_notifier); pr_info("B.A.T.M.A.N. advanced %s (compatibility version %i) loaded\n", SOURCE_VERSION, COMPAT_VERSION); @@ -79,8 +79,8 @@ static int __init batman_init(void) static void __exit batman_exit(void) { batadv_debugfs_destroy(); - unregister_netdevice_notifier(&hard_if_notifier); - hardif_remove_interfaces(); + unregister_netdevice_notifier(&batadv_hard_if_notifier); + batadv_hardif_remove_interfaces(); flush_workqueue(bat_event_workqueue); destroy_workqueue(bat_event_workqueue); |