The following commit has been merged in the merge/master branch: commit e821b76b67a0adcbb807ee29c930bb43c3d434d8 Author: Sven Eckelmann sven@narfation.org Date: Sat Aug 8 02:46:45 2015 +0200

batman-adv: Mark batadv_hardif_neigh_free_now as static

batadv_hardif_neigh_free_now is not used outside of originator.c and should thus be marked as static.

Fixes: fed2826b490c ("batman-adv: add list of unique single hop neighbors per hard-interface") Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 06f2d19..3c782a33 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -224,7 +224,8 @@ static void batadv_hardif_neigh_free_rcu(struct rcu_head *rcu) * and possibly free it (without rcu callback) * @hardif_neigh: hardif neigh neighbor to free */ -void batadv_hardif_neigh_free_now(struct batadv_hardif_neigh_node *hardif_neigh) +static void +batadv_hardif_neigh_free_now(struct batadv_hardif_neigh_node *hardif_neigh) { if (atomic_dec_and_test(&hardif_neigh->refcount)) batadv_hardif_neigh_free_rcu(&hardif_neigh->rcu); diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h index 8436eb9..2955775 100644 --- a/net/batman-adv/originator.h +++ b/net/batman-adv/originator.h @@ -46,8 +46,6 @@ batadv_hardif_neigh_get(const struct batadv_hard_iface *hard_iface, const u8 *neigh_addr); void batadv_hardif_neigh_free_ref(struct batadv_hardif_neigh_node *hardif_neigh); -void -batadv_hardif_neigh_free_now(struct batadv_hardif_neigh_node *hardif_neigh); struct batadv_neigh_node * batadv_neigh_node_new(struct batadv_orig_node *orig_node, struct batadv_hard_iface *hard_iface,