diff options
author | Sven Eckelmann <sven@narfation.org> | 2012-05-11 20:09:37 -0400 |
---|---|---|
committer | Antonio Quartulli <ordex@autistici.org> | 2012-06-20 16:15:26 -0400 |
commit | 9455e34cb2ded22e01abb6daa65ba1caeed8d7fe (patch) | |
tree | 56ac8dc90b5bcddcace5eea383b266e9654ecb2d /net/batman-adv/hard-interface.c | |
parent | 30d3c5113f9a3f162d65d01b771b122afac0ce79 (diff) |
batman-adv: Prefix send 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/hard-interface.c')
-rw-r--r-- | net/batman-adv/hard-interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 1f126cbd2c79..7392ae28114d 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c | |||
@@ -345,7 +345,7 @@ int batadv_hardif_enable_interface(struct hard_iface *hard_iface, | |||
345 | hard_iface->net_dev->name); | 345 | hard_iface->net_dev->name); |
346 | 346 | ||
347 | /* begin scheduling originator messages on that interface */ | 347 | /* begin scheduling originator messages on that interface */ |
348 | schedule_bat_ogm(hard_iface); | 348 | batadv_schedule_bat_ogm(hard_iface); |
349 | 349 | ||
350 | out: | 350 | out: |
351 | return 0; | 351 | return 0; |
@@ -391,7 +391,7 @@ void batadv_hardif_disable_interface(struct hard_iface *hard_iface) | |||
391 | 391 | ||
392 | /* delete all references to this hard_iface */ | 392 | /* delete all references to this hard_iface */ |
393 | batadv_purge_orig_ref(bat_priv); | 393 | batadv_purge_orig_ref(bat_priv); |
394 | purge_outstanding_packets(bat_priv, hard_iface); | 394 | batadv_purge_outstanding_packets(bat_priv, hard_iface); |
395 | dev_put(hard_iface->soft_iface); | 395 | dev_put(hard_iface->soft_iface); |
396 | 396 | ||
397 | /* nobody uses this interface anymore */ | 397 | /* nobody uses this interface anymore */ |