The following commit has been merged in the merge/master branch: commit 27a4cc24e2a2be78ecf1ffcfac1073bcc43c1c7e Merge: d1c596a379985d56c5e916e57254bffb71780a38 9e5e03716c0e6a12e4bb466a042bc519b55734bb Author: Marek Lindner mareklindner@neomailbox.ch Date: Sun Mar 20 18:24:38 2016 +0800

Merge branch 'next'

diff --combined net/batman-adv/originator.c index e63d6a5,d52f67a..3ca98fc --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@@ -54,9 -54,9 +54,9 @@@ static void batadv_purge_orig(struct wo * @node: node in the local table * @data2: second object to compare the node to * - * Return: 1 if they are the same originator + * Return: true if they are the same originator */ -int batadv_compare_orig(const struct hlist_node *node, const void *data2) +bool batadv_compare_orig(const struct hlist_node *node, const void *data2) { const void *data1 = container_of(node, struct batadv_orig_node, hash_entry); @@@ -663,6 -663,7 +663,7 @@@ batadv_neigh_node_new(struct batadv_ori 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);