aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/gateway_client.c
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2012-03-07 03:07:45 -0500
committerMarek Lindner <lindner_marek@yahoo.de>2012-03-10 17:29:44 -0500
commit86ceb360565d06fcee96be85c4bafe9264756eca (patch)
treef0a6a8782cd740222a068f20f5c48ee84aeb5b80 /net/batman-adv/gateway_client.c
parent7c64fd98ce512de6c6dae0452dc026446bd368d5 (diff)
batman-adv: Ignore 80-chars per line limits for strings
Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Diffstat (limited to 'net/batman-adv/gateway_client.c')
-rw-r--r--net/batman-adv/gateway_client.c31
1 files changed, 13 insertions, 18 deletions
diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index 0fa8e2d7c46e..6f9b9b78f77d 100644
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -224,16 +224,13 @@ void gw_election(struct bat_priv *bat_priv)
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, 227 next_gw->orig_node->orig, next_gw->orig_node->gw_flags,
228 next_gw->orig_node->gw_flags,
229 router->tq_avg); 228 router->tq_avg);
230 throw_uevent(bat_priv, UEV_GW, UEV_ADD, gw_addr); 229 throw_uevent(bat_priv, UEV_GW, UEV_ADD, gw_addr);
231 } else { 230 } else {
232 bat_dbg(DBG_BATMAN, bat_priv, 231 bat_dbg(DBG_BATMAN, bat_priv,
233 "Changing route to gateway %pM " 232 "Changing route to gateway %pM (gw_flags: %i, tq: %i)\n",
234 "(gw_flags: %i, tq: %i)\n", 233 next_gw->orig_node->orig, next_gw->orig_node->gw_flags,
235 next_gw->orig_node->orig,
236 next_gw->orig_node->gw_flags,
237 router->tq_avg); 234 router->tq_avg);
238 throw_uevent(bat_priv, UEV_GW, UEV_CHANGE, gw_addr); 235 throw_uevent(bat_priv, UEV_GW, UEV_CHANGE, gw_addr);
239 } 236 }
@@ -287,8 +284,7 @@ void gw_check_election(struct bat_priv *bat_priv, struct orig_node *orig_node)
287 goto out; 284 goto out;
288 285
289 bat_dbg(DBG_BATMAN, bat_priv, 286 bat_dbg(DBG_BATMAN, bat_priv,
290 "Restarting gateway selection: better gateway found (tq curr: " 287 "Restarting gateway selection: better gateway found (tq curr: %i, tq new: %i)\n",
291 "%i, tq new: %i)\n",
292 gw_tq_avg, orig_tq_avg); 288 gw_tq_avg, orig_tq_avg);
293 289
294deselect: 290deselect:
@@ -352,8 +348,7 @@ void gw_node_update(struct bat_priv *bat_priv,
352 continue; 348 continue;
353 349
354 bat_dbg(DBG_BATMAN, bat_priv, 350 bat_dbg(DBG_BATMAN, bat_priv,
355 "Gateway class of originator %pM changed from " 351 "Gateway class of originator %pM changed from %i to %i\n",
356 "%i to %i\n",
357 orig_node->orig, gw_node->orig_node->gw_flags, 352 orig_node->orig, gw_node->orig_node->gw_flags,
358 new_gwflags); 353 new_gwflags);
359 354
@@ -474,23 +469,23 @@ int gw_client_seq_print_text(struct seq_file *seq, void *offset)
474 469
475 primary_if = primary_if_get_selected(bat_priv); 470 primary_if = primary_if_get_selected(bat_priv);
476 if (!primary_if) { 471 if (!primary_if) {
477 ret = seq_printf(seq, "BATMAN mesh %s disabled - please " 472 ret = seq_printf(seq,
478 "specify interfaces to enable it\n", 473 "BATMAN mesh %s disabled - please specify interfaces to enable it\n",
479 net_dev->name); 474 net_dev->name);
480 goto out; 475 goto out;
481 } 476 }
482 477
483 if (primary_if->if_status != IF_ACTIVE) { 478 if (primary_if->if_status != IF_ACTIVE) {
484 ret = seq_printf(seq, "BATMAN mesh %s disabled - " 479 ret = seq_printf(seq,
485 "primary interface not active\n", 480 "BATMAN mesh %s disabled - primary interface not active\n",
486 net_dev->name); 481 net_dev->name);
487 goto out; 482 goto out;
488 } 483 }
489 484
490 seq_printf(seq, " %-12s (%s/%i) %17s [%10s]: gw_class ... " 485 seq_printf(seq,
491 "[B.A.T.M.A.N. adv %s, MainIF/MAC: %s/%pM (%s)]\n", 486 " %-12s (%s/%i) %17s [%10s]: gw_class ... [B.A.T.M.A.N. adv %s, MainIF/MAC: %s/%pM (%s)]\n",
492 "Gateway", "#", TQ_MAX_VALUE, "Nexthop", 487 "Gateway", "#", TQ_MAX_VALUE, "Nexthop", "outgoingIF",
493 "outgoingIF", SOURCE_VERSION, primary_if->net_dev->name, 488 SOURCE_VERSION, primary_if->net_dev->name,
494 primary_if->net_dev->dev_addr, net_dev->name); 489 primary_if->net_dev->dev_addr, net_dev->name);
495 490
496 rcu_read_lock(); 491 rcu_read_lock();