The following commit has been merged in the merge/master branch: commit 8c8e792a6c2acaae62593410835b3a85a546513f Author: Sven Eckelmann sven@narfation.org Date: Sun Sep 6 21:38:48 2015 +0200

batman-adv: Add kerneldoc for batadv_neigh_node::refcount

Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 1a67a1a..3437b66 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -371,6 +371,7 @@ struct batadv_hardif_neigh_node { * @ifinfo_lock: lock protecting private ifinfo members and list * @if_incoming: pointer to incoming hard interface * @last_seen: when last packet via this neighbor was received + * @refcount: number of contexts the object is used * @rcu: struct used for freeing in an RCU-safe manner */ struct batadv_neigh_node {