Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 321e3e08 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Antonio Quartulli
Browse files

batman-adv: Rename batadv_claim *_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 c8b86c12

net/batman-adv/bridge_loop_avoidance.c

+8 −8
Original line number Diff line number Diff line
@@ -184,11 +184,11 @@ static void batadv_claim_release(struct kref *ref) 
}



/**

 * batadv_claim_free_ref - decrement the claim refcounter and possibly

 * batadv_claim_put - decrement the claim refcounter and possibly

 *  release it

 * @claim: claim to be free'd

 */

static void batadv_claim_free_ref(struct batadv_bla_claim *claim)

static void batadv_claim_put(struct batadv_bla_claim *claim)

{

	kref_put(&claim->refcount, batadv_claim_release);

}
@@ -304,7 +304,7 @@ batadv_bla_del_backbone_claims(struct batadv_bla_backbone_gw *backbone_gw) 
			if (claim->backbone_gw != backbone_gw)

				continue;



			batadv_claim_free_ref(claim);

			batadv_claim_put(claim);

			hlist_del_rcu(&claim->hash_entry);

		}

		spin_unlock_bh(list_lock);
@@ -693,7 +693,7 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv, 
	backbone_gw->lasttime = jiffies;



claim_free_ref:

	batadv_claim_free_ref(claim);

	batadv_claim_put(claim);

}



/**
@@ -718,14 +718,14 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv, 


	batadv_hash_remove(bat_priv->bla.claim_hash, batadv_compare_claim,

			   batadv_choose_claim, claim);

	batadv_claim_free_ref(claim); /* reference from the hash is gone */

	batadv_claim_put(claim); /* reference from the hash is gone */



	spin_lock_bh(&claim->backbone_gw->crc_lock);

	claim->backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);

	spin_unlock_bh(&claim->backbone_gw->crc_lock);



	/* don't need the reference from hash_find() anymore */

	batadv_claim_free_ref(claim);

	batadv_claim_put(claim);

}



/**
@@ -1693,7 +1693,7 @@ int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, 
	if (primary_if)

		batadv_hardif_put(primary_if);

	if (claim)

		batadv_claim_free_ref(claim);

		batadv_claim_put(claim);

	return ret;

}
@@ -1782,7 +1782,7 @@ int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, 
	if (primary_if)

		batadv_hardif_put(primary_if);

	if (claim)

		batadv_claim_free_ref(claim);

		batadv_claim_put(claim);

	return ret;

}