aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/originator.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/originator.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/originator.c')
-rw-r--r--net/batman-adv/originator.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index 371cc93d8e17..43c0a4f1399e 100644
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -294,14 +294,12 @@ static bool purge_orig_neighbors(struct bat_priv *bat_priv,
294 (neigh_node->if_incoming->if_status == 294 (neigh_node->if_incoming->if_status ==
295 IF_TO_BE_REMOVED)) 295 IF_TO_BE_REMOVED))
296 bat_dbg(DBG_BATMAN, bat_priv, 296 bat_dbg(DBG_BATMAN, bat_priv,
297 "neighbor purge: originator %pM, " 297 "neighbor purge: originator %pM, neighbor: %pM, iface: %s\n",
298 "neighbor: %pM, iface: %s\n",
299 orig_node->orig, neigh_node->addr, 298 orig_node->orig, neigh_node->addr,
300 neigh_node->if_incoming->net_dev->name); 299 neigh_node->if_incoming->net_dev->name);
301 else 300 else
302 bat_dbg(DBG_BATMAN, bat_priv, 301 bat_dbg(DBG_BATMAN, bat_priv,
303 "neighbor timeout: originator %pM, " 302 "neighbor timeout: originator %pM, neighbor: %pM, last_valid: %lu\n",
304 "neighbor: %pM, last_valid: %lu\n",
305 orig_node->orig, neigh_node->addr, 303 orig_node->orig, neigh_node->addr,
306 (neigh_node->last_valid / HZ)); 304 (neigh_node->last_valid / HZ));
307 305
@@ -416,15 +414,15 @@ int orig_seq_print_text(struct seq_file *seq, void *offset)
416 primary_if = primary_if_get_selected(bat_priv); 414 primary_if = primary_if_get_selected(bat_priv);
417 415
418 if (!primary_if) { 416 if (!primary_if) {
419 ret = seq_printf(seq, "BATMAN mesh %s disabled - " 417 ret = seq_printf(seq,
420 "please specify interfaces to enable it\n", 418 "BATMAN mesh %s disabled - please specify interfaces to enable it\n",
421 net_dev->name); 419 net_dev->name);
422 goto out; 420 goto out;
423 } 421 }
424 422
425 if (primary_if->if_status != IF_ACTIVE) { 423 if (primary_if->if_status != IF_ACTIVE) {
426 ret = seq_printf(seq, "BATMAN mesh %s " 424 ret = seq_printf(seq,
427 "disabled - primary interface not active\n", 425 "BATMAN mesh %s disabled - primary interface not active\n",
428 net_dev->name); 426 net_dev->name);
429 goto out; 427 goto out;
430 } 428 }