aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/gateway_client.c
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2012-05-11 20:09:24 -0400
committerAntonio Quartulli <ordex@autistici.org>2012-06-20 16:15:15 -0400
commit5853e22c58b318232fd6e15033ccb0852f865c0b (patch)
tree334d4d1072caa23efeff29a105c50d43637f2246 /net/batman-adv/gateway_client.c
parent40a072d777a4f417c0296e06f91297b0f3f2fa36 (diff)
batman-adv: Prefix bat_sysfs 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/gateway_client.c')
-rw-r--r--net/batman-adv/gateway_client.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index 47f7186dcefc..1d7f08e026f3 100644
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -220,19 +220,19 @@ void gw_election(struct bat_priv *bat_priv)
220 if ((curr_gw) && (!next_gw)) { 220 if ((curr_gw) && (!next_gw)) {
221 bat_dbg(DBG_BATMAN, bat_priv, 221 bat_dbg(DBG_BATMAN, bat_priv,
222 "Removing selected gateway - no gateway in range\n"); 222 "Removing selected gateway - no gateway in range\n");
223 throw_uevent(bat_priv, UEV_GW, UEV_DEL, NULL); 223 batadv_throw_uevent(bat_priv, UEV_GW, UEV_DEL, NULL);
224 } else if ((!curr_gw) && (next_gw)) { 224 } else if ((!curr_gw) && (next_gw)) {
225 bat_dbg(DBG_BATMAN, bat_priv, 225 bat_dbg(DBG_BATMAN, bat_priv,
226 "Adding route to gateway %pM (gw_flags: %i, tq: %i)\n", 226 "Adding route to gateway %pM (gw_flags: %i, tq: %i)\n",
227 next_gw->orig_node->orig, next_gw->orig_node->gw_flags, 227 next_gw->orig_node->orig, next_gw->orig_node->gw_flags,
228 router->tq_avg); 228 router->tq_avg);
229 throw_uevent(bat_priv, UEV_GW, UEV_ADD, gw_addr); 229 batadv_throw_uevent(bat_priv, UEV_GW, UEV_ADD, gw_addr);
230 } else { 230 } else {
231 bat_dbg(DBG_BATMAN, bat_priv, 231 bat_dbg(DBG_BATMAN, bat_priv,
232 "Changing route to gateway %pM (gw_flags: %i, tq: %i)\n", 232 "Changing route to gateway %pM (gw_flags: %i, tq: %i)\n",
233 next_gw->orig_node->orig, next_gw->orig_node->gw_flags, 233 next_gw->orig_node->orig, next_gw->orig_node->gw_flags,
234 router->tq_avg); 234 router->tq_avg);
235 throw_uevent(bat_priv, UEV_GW, UEV_CHANGE, gw_addr); 235 batadv_throw_uevent(bat_priv, UEV_GW, UEV_CHANGE, gw_addr);
236 } 236 }
237 237
238 gw_select(bat_priv, next_gw); 238 gw_select(bat_priv, next_gw);