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

[cascardo/linux.git] / net / batman-adv / soft-interface.c

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index ca8fa4e..0710379 100644 (file)
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -497,11 +497,11 @@ static void batadv_softif_vlan_release(struct kref *ref)
 }
 
 /**
- * batadv_softif_vlan_free_ref - decrease the vlan object refcounter and
+ * batadv_softif_vlan_put - decrease the vlan object refcounter and
  *  possibly release it
  * @vlan: the vlan object to release
  */
-void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *vlan)
+void batadv_softif_vlan_put(struct batadv_softif_vlan *vlan)
 {
        if (!vlan)
                return;
@@ -552,7 +552,7 @@ int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid)
 
        vlan = batadv_softif_vlan_get(bat_priv, vid);
        if (vlan) {
-               batadv_softif_vlan_free_ref(vlan);
+               batadv_softif_vlan_put(vlan);
                return -EEXIST;
        }
 
@@ -601,7 +601,7 @@ static void batadv_softif_destroy_vlan(struct batadv_priv *bat_priv,
                               vlan->vid, "vlan interface destroyed", false);
 
        batadv_sysfs_del_vlan(bat_priv, vlan);
-       batadv_softif_vlan_free_ref(vlan);
+       batadv_softif_vlan_put(vlan);
 }
 
 /**
@@ -646,7 +646,7 @@ static int batadv_interface_add_vid(struct net_device *dev, __be16 proto,
        if (!vlan->kobj) {
                ret = batadv_sysfs_add_vlan(bat_priv->soft_iface, vlan);
                if (ret) {
-                       batadv_softif_vlan_free_ref(vlan);
+                       batadv_softif_vlan_put(vlan);
                        return ret;
                }
        }
@@ -693,7 +693,7 @@ static int batadv_interface_kill_vid(struct net_device *dev, __be16 proto,
        batadv_softif_destroy_vlan(bat_priv, vlan);
 
        /* finally free the vlan object */
-       batadv_softif_vlan_free_ref(vlan);
+       batadv_softif_vlan_put(vlan);
 
        return 0;
 }
@@ -749,7 +749,7 @@ static void batadv_softif_destroy_finish(struct work_struct *work)
        vlan = batadv_softif_vlan_get(bat_priv, BATADV_NO_FLAGS);
        if (vlan) {
                batadv_softif_destroy_vlan(bat_priv, vlan);
-               batadv_softif_vlan_free_ref(vlan);
+               batadv_softif_vlan_put(vlan);
        }
 
        batadv_sysfs_del_meshif(soft_iface);