The following commit has been merged in the merge/master branch: commit ab08dfe956b8a116ad29966be3a32ae4bced70fe Author: Sven Eckelmann sven@narfation.org Date: Tue Jan 5 12:06:16 2016 +0100

batman-adv: Fix kernel-doc for batadv_claim_free_ref

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

diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index eacf241..034db05 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -168,7 +168,8 @@ static void batadv_claim_free_rcu(struct rcu_head *rcu) }

/** - * batadv_claim_free_rcu - free a claim + * batadv_claim_free_ref - decrement the claim refcounter and possibly + * release it * @claim: claim to be free'd */ static void batadv_claim_free_ref(struct batadv_bla_claim *claim)