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/bat_debugfs.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/bat_debugfs.c')
-rw-r--r-- | net/batman-adv/bat_debugfs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/batman-adv/bat_debugfs.c b/net/batman-adv/bat_debugfs.c index db8273c26989..444d10bc9552 100644 --- a/net/batman-adv/bat_debugfs.c +++ b/net/batman-adv/bat_debugfs.c | |||
@@ -76,7 +76,7 @@ static int fdebug_log(struct debug_log *debug_log, const char *fmt, ...) | |||
76 | return 0; | 76 | return 0; |
77 | } | 77 | } |
78 | 78 | ||
79 | int debug_log(struct bat_priv *bat_priv, const char *fmt, ...) | 79 | int batadv_debug_log(struct bat_priv *bat_priv, const char *fmt, ...) |
80 | { | 80 | { |
81 | va_list args; | 81 | va_list args; |
82 | char tmp_log_buf[256]; | 82 | char tmp_log_buf[256]; |
@@ -304,7 +304,7 @@ static struct bat_debuginfo *mesh_debuginfos[] = { | |||
304 | NULL, | 304 | NULL, |
305 | }; | 305 | }; |
306 | 306 | ||
307 | void debugfs_init(void) | 307 | void batadv_debugfs_init(void) |
308 | { | 308 | { |
309 | struct bat_debuginfo *bat_debug; | 309 | struct bat_debuginfo *bat_debug; |
310 | struct dentry *file; | 310 | struct dentry *file; |
@@ -327,7 +327,7 @@ out: | |||
327 | return; | 327 | return; |
328 | } | 328 | } |
329 | 329 | ||
330 | void debugfs_destroy(void) | 330 | void batadv_debugfs_destroy(void) |
331 | { | 331 | { |
332 | if (bat_debugfs) { | 332 | if (bat_debugfs) { |
333 | debugfs_remove_recursive(bat_debugfs); | 333 | debugfs_remove_recursive(bat_debugfs); |
@@ -335,7 +335,7 @@ void debugfs_destroy(void) | |||
335 | } | 335 | } |
336 | } | 336 | } |
337 | 337 | ||
338 | int debugfs_add_meshif(struct net_device *dev) | 338 | int batadv_debugfs_add_meshif(struct net_device *dev) |
339 | { | 339 | { |
340 | struct bat_priv *bat_priv = netdev_priv(dev); | 340 | struct bat_priv *bat_priv = netdev_priv(dev); |
341 | struct bat_debuginfo **bat_debug; | 341 | struct bat_debuginfo **bat_debug; |
@@ -378,7 +378,7 @@ out: | |||
378 | #endif /* CONFIG_DEBUG_FS */ | 378 | #endif /* CONFIG_DEBUG_FS */ |
379 | } | 379 | } |
380 | 380 | ||
381 | void debugfs_del_meshif(struct net_device *dev) | 381 | void batadv_debugfs_del_meshif(struct net_device *dev) |
382 | { | 382 | { |
383 | struct bat_priv *bat_priv = netdev_priv(dev); | 383 | struct bat_priv *bat_priv = netdev_priv(dev); |
384 | 384 | ||