[B.A.T.M.A.N.] [PATCH] batman-adv: Mark batadv_hardif_neigh_free_now as static

Sven Eckelmann sven at narfation.org
Sat Aug 8 02:46:45 CEST 2015


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 at narfation.org>
---
 net/batman-adv/originator.c | 3 ++-
 net/batman-adv/originator.h | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index 06f2d1978640..3c782a33bdac 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 8436eb971800..29557753d552 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,
-- 
2.5.0



More information about the B.A.T.M.A.N mailing list