[linux-next] LinuxNextTracking branch, master, updated. next-20170804

batman at open-mesh.org batman at open-mesh.org
Sat Aug 5 00:16:03 CEST 2017


The following commit has been merged in the master branch:
commit 6a04be8d860e86ad84b99045395d9e46ed7304cf
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Jun 18 10:12:30 2017 +0200

    batman-adv: Remove too short %pM printk field width
    
    The string representation for a mac address produced by %pM is 17
    characters long. Left-aligning the output in a 15 character wide field
    width %-15pM is therefore misleading and unnecessary.
    
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index a3501173e200..c27001d38574 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -1281,7 +1281,7 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node,
 	batadv_ogm_packet->tq = combined_tq;
 
 	batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
-		   "bidirectional: orig = %-15pM neigh = %-15pM => own_bcast = %2i, real recv = %2i, local tq: %3i, asym_penalty: %3i, iface_penalty: %3i, total tq: %3i, if_incoming = %s, if_outgoing = %s\n",
+		   "bidirectional: orig = %pM neigh = %pM => own_bcast = %2i, real recv = %2i, local tq: %3i, asym_penalty: %3i, iface_penalty: %3i, total tq: %3i, if_incoming = %s, if_outgoing = %s\n",
 		   orig_node->orig, orig_neigh_node->orig, total_count,
 		   neigh_rq_count, tq_own, tq_asym_penalty, tq_iface_penalty,
 		   batadv_ogm_packet->tq, if_incoming->net_dev->name,

-- 
LinuxNextTracking


More information about the linux-merge mailing list