aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/gateway_client.c
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2012-05-12 07:48:58 -0400
committerAntonio Quartulli <ordex@autistici.org>2012-06-25 02:21:30 -0400
commit1eda58bfc56c43e73a0cf2bfb6e4d620ab866109 (patch)
treed71ba63d988193126831e49bdce03a1131d28ea4 /net/batman-adv/gateway_client.c
parentf0530ee5fb9e73465ac844ada2c96a2bea85a18f (diff)
batman-adv: Prefix main static inline functions with batadv_
All non-static symbols of batman-adv were prefixed with batadv_ to avoid collisions with other symbols of the kernel. Other symbols of batman-adv should use the same prefix to keep the naming scheme consistent. 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.c54
1 files changed, 27 insertions, 27 deletions
diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index c917a2ee1f39..318c112aa98c 100644
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -217,20 +217,20 @@ void batadv_gw_election(struct bat_priv *bat_priv)
217 } 217 }
218 218
219 if ((curr_gw) && (!next_gw)) { 219 if ((curr_gw) && (!next_gw)) {
220 bat_dbg(DBG_BATMAN, bat_priv, 220 batadv_dbg(DBG_BATMAN, bat_priv,
221 "Removing selected gateway - no gateway in range\n"); 221 "Removing selected gateway - no gateway in range\n");
222 batadv_throw_uevent(bat_priv, UEV_GW, UEV_DEL, NULL); 222 batadv_throw_uevent(bat_priv, UEV_GW, UEV_DEL, NULL);
223 } else if ((!curr_gw) && (next_gw)) { 223 } else if ((!curr_gw) && (next_gw)) {
224 bat_dbg(DBG_BATMAN, bat_priv, 224 batadv_dbg(DBG_BATMAN, bat_priv,
225 "Adding route to gateway %pM (gw_flags: %i, tq: %i)\n", 225 "Adding route to gateway %pM (gw_flags: %i, tq: %i)\n",
226 next_gw->orig_node->orig, next_gw->orig_node->gw_flags, 226 next_gw->orig_node->orig,
227 router->tq_avg); 227 next_gw->orig_node->gw_flags, router->tq_avg);
228 batadv_throw_uevent(bat_priv, UEV_GW, UEV_ADD, gw_addr); 228 batadv_throw_uevent(bat_priv, UEV_GW, UEV_ADD, gw_addr);
229 } else { 229 } else {
230 bat_dbg(DBG_BATMAN, bat_priv, 230 batadv_dbg(DBG_BATMAN, bat_priv,
231 "Changing route to gateway %pM (gw_flags: %i, tq: %i)\n", 231 "Changing route to gateway %pM (gw_flags: %i, tq: %i)\n",
232 next_gw->orig_node->orig, next_gw->orig_node->gw_flags, 232 next_gw->orig_node->orig,
233 router->tq_avg); 233 next_gw->orig_node->gw_flags, router->tq_avg);
234 batadv_throw_uevent(bat_priv, UEV_GW, UEV_CHANGE, gw_addr); 234 batadv_throw_uevent(bat_priv, UEV_GW, UEV_CHANGE, gw_addr);
235 } 235 }
236 236
@@ -282,9 +282,9 @@ void batadv_gw_check_election(struct bat_priv *bat_priv,
282 (orig_tq_avg - gw_tq_avg < atomic_read(&bat_priv->gw_sel_class))) 282 (orig_tq_avg - gw_tq_avg < atomic_read(&bat_priv->gw_sel_class)))
283 goto out; 283 goto out;
284 284
285 bat_dbg(DBG_BATMAN, bat_priv, 285 batadv_dbg(DBG_BATMAN, bat_priv,
286 "Restarting gateway selection: better gateway found (tq curr: %i, tq new: %i)\n", 286 "Restarting gateway selection: better gateway found (tq curr: %i, tq new: %i)\n",
287 gw_tq_avg, orig_tq_avg); 287 gw_tq_avg, orig_tq_avg);
288 288
289deselect: 289deselect:
290 batadv_gw_deselect(bat_priv); 290 batadv_gw_deselect(bat_priv);
@@ -318,13 +318,13 @@ static void gw_node_add(struct bat_priv *bat_priv,
318 spin_unlock_bh(&bat_priv->gw_list_lock); 318 spin_unlock_bh(&bat_priv->gw_list_lock);
319 319
320 batadv_gw_bandwidth_to_kbit(new_gwflags, &down, &up); 320 batadv_gw_bandwidth_to_kbit(new_gwflags, &down, &up);
321 bat_dbg(DBG_BATMAN, bat_priv, 321 batadv_dbg(DBG_BATMAN, bat_priv,
322 "Found new gateway %pM -> gw_class: %i - %i%s/%i%s\n", 322 "Found new gateway %pM -> gw_class: %i - %i%s/%i%s\n",
323 orig_node->orig, new_gwflags, 323 orig_node->orig, new_gwflags,
324 (down > 2048 ? down / 1024 : down), 324 (down > 2048 ? down / 1024 : down),
325 (down > 2048 ? "MBit" : "KBit"), 325 (down > 2048 ? "MBit" : "KBit"),
326 (up > 2048 ? up / 1024 : up), 326 (up > 2048 ? up / 1024 : up),
327 (up > 2048 ? "MBit" : "KBit")); 327 (up > 2048 ? "MBit" : "KBit"));
328} 328}
329 329
330void batadv_gw_node_update(struct bat_priv *bat_priv, 330void batadv_gw_node_update(struct bat_priv *bat_priv,
@@ -345,18 +345,18 @@ void batadv_gw_node_update(struct bat_priv *bat_priv,
345 if (gw_node->orig_node != orig_node) 345 if (gw_node->orig_node != orig_node)
346 continue; 346 continue;
347 347
348 bat_dbg(DBG_BATMAN, bat_priv, 348 batadv_dbg(DBG_BATMAN, bat_priv,
349 "Gateway class of originator %pM changed from %i to %i\n", 349 "Gateway class of originator %pM changed from %i to %i\n",
350 orig_node->orig, gw_node->orig_node->gw_flags, 350 orig_node->orig, gw_node->orig_node->gw_flags,
351 new_gwflags); 351 new_gwflags);
352 352
353 gw_node->deleted = 0; 353 gw_node->deleted = 0;
354 354
355 if (new_gwflags == NO_FLAGS) { 355 if (new_gwflags == NO_FLAGS) {
356 gw_node->deleted = jiffies; 356 gw_node->deleted = jiffies;
357 bat_dbg(DBG_BATMAN, bat_priv, 357 batadv_dbg(DBG_BATMAN, bat_priv,
358 "Gateway %pM removed from gateway list\n", 358 "Gateway %pM removed from gateway list\n",
359 orig_node->orig); 359 orig_node->orig);
360 360
361 if (gw_node == curr_gw) 361 if (gw_node == curr_gw)
362 goto deselect; 362 goto deselect;