aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/soft-interface.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/batman-adv/soft-interface.c')
-rw-r--r--net/batman-adv/soft-interface.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 8fb16d209fd9..a5590f4193f1 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -252,8 +252,8 @@ static void softif_neigh_vid_select(struct bat_priv *bat_priv,
252 vid, curr_neigh->addr); 252 vid, curr_neigh->addr);
253 else if ((curr_neigh) && (new_neigh)) 253 else if ((curr_neigh) && (new_neigh))
254 bat_dbg(DBG_ROUTES, bat_priv, 254 bat_dbg(DBG_ROUTES, bat_priv,
255 "Changing mesh exit point on vid: %d from %pM " 255 "Changing mesh exit point on vid: %d from %pM to %pM.\n",
256 "to %pM.\n", vid, curr_neigh->addr, new_neigh->addr); 256 vid, curr_neigh->addr, new_neigh->addr);
257 else if ((!curr_neigh) && (new_neigh)) 257 else if ((!curr_neigh) && (new_neigh))
258 bat_dbg(DBG_ROUTES, bat_priv, 258 bat_dbg(DBG_ROUTES, bat_priv,
259 "Setting mesh exit point on vid: %d to %pM.\n", 259 "Setting mesh exit point on vid: %d to %pM.\n",
@@ -327,15 +327,15 @@ int softif_neigh_seq_print_text(struct seq_file *seq, void *offset)
327 327
328 primary_if = primary_if_get_selected(bat_priv); 328 primary_if = primary_if_get_selected(bat_priv);
329 if (!primary_if) { 329 if (!primary_if) {
330 ret = seq_printf(seq, "BATMAN mesh %s disabled - " 330 ret = seq_printf(seq,
331 "please specify interfaces to enable it\n", 331 "BATMAN mesh %s disabled - please specify interfaces to enable it\n",
332 net_dev->name); 332 net_dev->name);
333 goto out; 333 goto out;
334 } 334 }
335 335
336 if (primary_if->if_status != IF_ACTIVE) { 336 if (primary_if->if_status != IF_ACTIVE) {
337 ret = seq_printf(seq, "BATMAN mesh %s " 337 ret = seq_printf(seq,
338 "disabled - primary interface not active\n", 338 "BATMAN mesh %s disabled - primary interface not active\n",
339 net_dev->name); 339 net_dev->name);
340 goto out; 340 goto out;
341 } 341 }
@@ -403,8 +403,7 @@ void softif_neigh_purge(struct bat_priv *bat_priv)
403 403
404 if (curr_softif_neigh == softif_neigh) { 404 if (curr_softif_neigh == softif_neigh) {
405 bat_dbg(DBG_ROUTES, bat_priv, 405 bat_dbg(DBG_ROUTES, bat_priv,
406 "Current mesh exit point on vid: %d " 406 "Current mesh exit point on vid: %d '%pM' vanished.\n",
407 "'%pM' vanished.\n",
408 softif_neigh_vid->vid, 407 softif_neigh_vid->vid,
409 softif_neigh->addr); 408 softif_neigh->addr);
410 do_deselect = 1; 409 do_deselect = 1;