diff options
author | Sven Eckelmann <sven@narfation.org> | 2012-05-11 20:09:23 -0400 |
---|---|---|
committer | Antonio Quartulli <ordex@autistici.org> | 2012-06-20 16:15:14 -0400 |
commit | 40a072d777a4f417c0296e06f91297b0f3f2fa36 (patch) | |
tree | 1490957336c2873cd3ec5e586927e92bc3e9a17a /net/batman-adv/soft-interface.c | |
parent | 81c524f76a353a19097e004ec05e4d62fd0bd57e (diff) |
batman-adv: Prefix bat_debugfs 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/soft-interface.c')
-rw-r--r-- | net/batman-adv/soft-interface.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 304a7ba09e03..0f0003b00f8c 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c | |||
@@ -419,7 +419,7 @@ struct net_device *softif_create(const char *name) | |||
419 | if (ret < 0) | 419 | if (ret < 0) |
420 | goto free_bat_counters; | 420 | goto free_bat_counters; |
421 | 421 | ||
422 | ret = debugfs_add_meshif(soft_iface); | 422 | ret = batadv_debugfs_add_meshif(soft_iface); |
423 | if (ret < 0) | 423 | if (ret < 0) |
424 | goto unreg_sysfs; | 424 | goto unreg_sysfs; |
425 | 425 | ||
@@ -430,7 +430,7 @@ struct net_device *softif_create(const char *name) | |||
430 | return soft_iface; | 430 | return soft_iface; |
431 | 431 | ||
432 | unreg_debugfs: | 432 | unreg_debugfs: |
433 | debugfs_del_meshif(soft_iface); | 433 | batadv_debugfs_del_meshif(soft_iface); |
434 | unreg_sysfs: | 434 | unreg_sysfs: |
435 | sysfs_del_meshif(soft_iface); | 435 | sysfs_del_meshif(soft_iface); |
436 | free_bat_counters: | 436 | free_bat_counters: |
@@ -447,7 +447,7 @@ out: | |||
447 | 447 | ||
448 | void softif_destroy(struct net_device *soft_iface) | 448 | void softif_destroy(struct net_device *soft_iface) |
449 | { | 449 | { |
450 | debugfs_del_meshif(soft_iface); | 450 | batadv_debugfs_del_meshif(soft_iface); |
451 | sysfs_del_meshif(soft_iface); | 451 | sysfs_del_meshif(soft_iface); |
452 | mesh_free(soft_iface); | 452 | mesh_free(soft_iface); |
453 | unregister_netdevice(soft_iface); | 453 | unregister_netdevice(soft_iface); |