diff options
| author | David S. Miller <davem@davemloft.net> | 2012-03-11 15:36:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-11 15:36:34 -0700 |
| commit | e8abbe0d0236ac1d55d21fec7a8d2ee03e9d3258 (patch) | |
| tree | 222115ab13209862ffdf35c11c9f7923a059188c /net/batman-adv/originator.c | |
| parent | bb092c0db883d435d9d774e10b4cf71f12aad122 (diff) | |
| parent | 40e0c4f51d3fc3fd54edc797adae314fbe2b96a6 (diff) | |
| download | lwn-e8abbe0d0236ac1d55d21fec7a8d2ee03e9d3258.tar.gz lwn-e8abbe0d0236ac1d55d21fec7a8d2ee03e9d3258.zip | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Diffstat (limited to 'net/batman-adv/originator.c')
| -rw-r--r-- | net/batman-adv/originator.c | 14 |
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, (neigh_node->if_incoming->if_status == IF_TO_BE_REMOVED)) bat_dbg(DBG_BATMAN, bat_priv, - "neighbor purge: originator %pM, " - "neighbor: %pM, iface: %s\n", + "neighbor purge: originator %pM, neighbor: %pM, iface: %s\n", orig_node->orig, neigh_node->addr, neigh_node->if_incoming->net_dev->name); else bat_dbg(DBG_BATMAN, bat_priv, - "neighbor timeout: originator %pM, " - "neighbor: %pM, last_valid: %lu\n", + "neighbor timeout: originator %pM, neighbor: %pM, last_valid: %lu\n", orig_node->orig, neigh_node->addr, (neigh_node->last_valid / HZ)); @@ -416,15 +414,15 @@ int orig_seq_print_text(struct seq_file *seq, void *offset) primary_if = primary_if_get_selected(bat_priv); if (!primary_if) { - ret = seq_printf(seq, "BATMAN mesh %s disabled - " - "please specify interfaces to enable it\n", + ret = seq_printf(seq, + "BATMAN mesh %s disabled - please specify interfaces to enable it\n", net_dev->name); goto out; } if (primary_if->if_status != IF_ACTIVE) { - ret = seq_printf(seq, "BATMAN mesh %s " - "disabled - primary interface not active\n", + ret = seq_printf(seq, + "BATMAN mesh %s disabled - primary interface not active\n", net_dev->name); goto out; } |