batman-adv: Rename batadv_nc_path *_free_ref function to *_put
authorSven Eckelmann <sven@narfation.org>
Sun, 17 Jan 2016 10:01:23 +0000 (11:01 +0100)
committerAntonio Quartulli <a@unstable.cc>
Tue, 23 Feb 2016 05:49:11 +0000 (13:49 +0800)
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: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <a@unstable.cc>
net/batman-adv/network-coding.c

index 6105cfb0574c5403d9917e5745dfce8f2fc73fa0..d253bb23e2acb6f431732f64a2631e7892e2e8ee 100644 (file)
@@ -247,11 +247,11 @@ static void batadv_nc_path_release(struct kref *ref)
 }
 
 /**
- * batadv_nc_path_free_ref - decrement the nc_path refcounter and possibly
+ * batadv_nc_path_put - decrement the nc_path refcounter and possibly
  *  release it
  * @nc_path: nc_path to be free'd
  */
-static void batadv_nc_path_free_ref(struct batadv_nc_path *nc_path)
+static void batadv_nc_path_put(struct batadv_nc_path *nc_path)
 {
        kref_put(&nc_path->refcount, batadv_nc_path_release);
 }
@@ -263,7 +263,7 @@ static void batadv_nc_path_free_ref(struct batadv_nc_path *nc_path)
 static void batadv_nc_packet_free(struct batadv_nc_packet *nc_packet)
 {
        kfree_skb(nc_packet->skb);
-       batadv_nc_path_free_ref(nc_packet->nc_path);
+       batadv_nc_path_put(nc_packet->nc_path);
        kfree(nc_packet);
 }
 
@@ -467,7 +467,7 @@ static void batadv_nc_purge_paths(struct batadv_priv *bat_priv,
                                   "Remove nc_path %pM -> %pM\n",
                                   nc_path->prev_hop, nc_path->next_hop);
                        hlist_del_rcu(&nc_path->hash_entry);
-                       batadv_nc_path_free_ref(nc_path);
+                       batadv_nc_path_put(nc_path);
                }
                spin_unlock_bh(lock);
        }
@@ -1555,7 +1555,7 @@ bool batadv_nc_skb_forward(struct sk_buff *skb,
        return true;
 
 free_nc_path:
-       batadv_nc_path_free_ref(nc_path);
+       batadv_nc_path_put(nc_path);
 out:
        /* Packet is not consumed */
        return false;
@@ -1617,7 +1617,7 @@ void batadv_nc_skb_store_for_decoding(struct batadv_priv *bat_priv,
 free_skb:
        kfree_skb(skb);
 free_nc_path:
-       batadv_nc_path_free_ref(nc_path);
+       batadv_nc_path_put(nc_path);
 out:
        return;
 }