Commit accadc35 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Antonio Quartulli

batman-adv: Rename batadv_hardif_neigh *_free_ref function to *_put

The batman-adv source code is the only place in the kernel which uses the
*_free_ref naming scheme for the *_put functions. Changing it to *_put
makes it more consistent and makes it easier to understand the connection
to the *_get functions.
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: default avatarAntonio Quartulli <a@unstable.cc>
parent 35f94779
...@@ -1574,7 +1574,7 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset, ...@@ -1574,7 +1574,7 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset,
if (orig_neigh_router) if (orig_neigh_router)
batadv_neigh_node_put(orig_neigh_router); batadv_neigh_node_put(orig_neigh_router);
if (hardif_neigh) if (hardif_neigh)
batadv_hardif_neigh_free_ref(hardif_neigh); batadv_hardif_neigh_put(hardif_neigh);
kfree_skb(skb_priv); kfree_skb(skb_priv);
} }
......
...@@ -232,11 +232,11 @@ static void batadv_hardif_neigh_release(struct kref *ref) ...@@ -232,11 +232,11 @@ static void batadv_hardif_neigh_release(struct kref *ref)
} }
/** /**
* batadv_hardif_neigh_free_ref - decrement the hardif neighbors refcounter * batadv_hardif_neigh_put - decrement the hardif neighbors refcounter
* and possibly release it * and possibly release it
* @hardif_neigh: hardif neigh neighbor to free * @hardif_neigh: hardif neigh neighbor to free
*/ */
void batadv_hardif_neigh_free_ref(struct batadv_hardif_neigh_node *hardif_neigh) void batadv_hardif_neigh_put(struct batadv_hardif_neigh_node *hardif_neigh)
{ {
kref_put(&hardif_neigh->refcount, batadv_hardif_neigh_release); kref_put(&hardif_neigh->refcount, batadv_hardif_neigh_release);
} }
...@@ -266,8 +266,8 @@ static void batadv_neigh_node_release(struct kref *ref) ...@@ -266,8 +266,8 @@ static void batadv_neigh_node_release(struct kref *ref)
neigh_node->addr); neigh_node->addr);
if (hardif_neigh) { if (hardif_neigh) {
/* batadv_hardif_neigh_get() increases refcount too */ /* batadv_hardif_neigh_get() increases refcount too */
batadv_hardif_neigh_free_ref(hardif_neigh); batadv_hardif_neigh_put(hardif_neigh);
batadv_hardif_neigh_free_ref(hardif_neigh); batadv_hardif_neigh_put(hardif_neigh);
} }
if (bao->bat_neigh_free) if (bao->bat_neigh_free)
...@@ -681,7 +681,7 @@ batadv_neigh_node_new(struct batadv_orig_node *orig_node, ...@@ -681,7 +681,7 @@ batadv_neigh_node_new(struct batadv_orig_node *orig_node,
out: out:
if (hardif_neigh) if (hardif_neigh)
batadv_hardif_neigh_free_ref(hardif_neigh); batadv_hardif_neigh_put(hardif_neigh);
return neigh_node; return neigh_node;
} }
......
...@@ -44,7 +44,7 @@ struct batadv_hardif_neigh_node * ...@@ -44,7 +44,7 @@ struct batadv_hardif_neigh_node *
batadv_hardif_neigh_get(const struct batadv_hard_iface *hard_iface, batadv_hardif_neigh_get(const struct batadv_hard_iface *hard_iface,
const u8 *neigh_addr); const u8 *neigh_addr);
void void
batadv_hardif_neigh_free_ref(struct batadv_hardif_neigh_node *hardif_neigh); batadv_hardif_neigh_put(struct batadv_hardif_neigh_node *hardif_neigh);
struct batadv_neigh_node * struct batadv_neigh_node *
batadv_neigh_node_new(struct batadv_orig_node *orig_node, batadv_neigh_node_new(struct batadv_orig_node *orig_node,
struct batadv_hard_iface *hard_iface, struct batadv_hard_iface *hard_iface,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment