The following commit has been merged in the master branch: commit e48474ed8a217b7f80f2a42bc05352406a06cb67 Author: Marek Lindner mareklindner@neomailbox.ch Date: Fri Mar 11 16:01:09 2016 +0100

batman-adv: init neigh node last seen field

Signed-off-by: Marek Lindner mareklindner@neomailbox.ch [sven@narfation.org: fix conflicts with current version] Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Antonio Quartulli a@unstable.cc

diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index e4cbb07..d52f67a 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -663,6 +663,7 @@ batadv_neigh_node_new(struct batadv_orig_node *orig_node, ether_addr_copy(neigh_node->addr, neigh_addr); neigh_node->if_incoming = hard_iface; neigh_node->orig_node = orig_node; + neigh_node->last_seen = jiffies;

/* extra reference for return */ kref_init(&neigh_node->refcount);