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

batman at open-mesh.org batman at open-mesh.org
Tue Jan 12 00:15:48 CET 2016


The following commit has been merged in the master branch:
commit ed21d170e878b6b067a3216040b7b935c8007196
Author: Sven Eckelmann <sven at 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 at narfation.org>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>
    Signed-off-by: Antonio Quartulli <a at unstable.cc>

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 {

-- 
LinuxNextTracking


More information about the linux-merge mailing list