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

batman at open-mesh.org batman at open-mesh.org
Sat Jun 1 00:18:26 CEST 2013


The following commit has been merged in the master branch:
commit d1dc30739c587fe65f4120c045258ab01c79db1b
Author: Antonio Quartulli <antonio at open-mesh.com>
Date:   Mon Mar 25 13:54:45 2013 +0100

    batman-adv: slightly improve neighbor creation debug message
    
    print the interface along with the new neighbor mac address
    
    Signed-off-by: Antonio Quartulli <antonio at open-mesh.com>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>

diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index ddf5634..f50553a 100644
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -110,7 +110,8 @@ batadv_neigh_node_new(struct batadv_hard_iface *hard_iface,
 	atomic_set(&neigh_node->refcount, 2);
 
 	batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
-		   "Creating new neighbor %pM\n", neigh_addr);
+		   "Creating new neighbor %pM on interface %s\n", neigh_addr,
+		   hard_iface->net_dev->name);
 
 out:
 	return neigh_node;

-- 
LinuxNextTracking


More information about the linux-merge mailing list