diff mbox

[maint,2/2] batman-adv: fix var name to keep compatibility with old kernels

Message ID 1400144887-24455-2-git-send-email-antonio@meshcoding.com (mailing list archive)
State Accepted, archived
Commit b53915310227cc9b029ba0fa5aae44e50a461f80
Headers

Commit Message

Antonio Quartulli May 15, 2014, 9:08 a.m. UTC 
  The first argument of kfree_rcu() is used in compat.h to forge
a function name used by old kernels. Keep it as it was before
to avoid breaking this compat mechanism.

Introduced by 9729d2085c0fa4398eb1ee518b0097866dfdcd77
("batman-adv: fix TT VLAN inconsistency on VLAN re-add")

Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
---
 soft-interface.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Marek Lindner May 15, 2014, 6:57 p.m. UTC | #1 
On Thursday 15 May 2014 11:08:07 Antonio Quartulli wrote:
> The first argument of kfree_rcu() is used in compat.h to forge
> a function name used by old kernels. Keep it as it was before
> to avoid breaking this compat mechanism.
> 
> Introduced by 9729d2085c0fa4398eb1ee518b0097866dfdcd77
> ("batman-adv: fix TT VLAN inconsistency on VLAN re-add")
> 
> Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
> ---
>  soft-interface.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)

Applied in revision b539153.

Thanks,
Marek
diff mbox

Patch

diff --git a/soft-interface.c b/soft-interface.c
index 82804e7..a4e6e5e 100644
--- a/soft-interface.c
+++ b/soft-interface.c
@@ -437,14 +437,14 @@  out:
  *  possibly free it
  * @softif_vlan: the vlan object to release
  */
-void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *vlan)
+void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *softif_vlan)
 {
-	if (atomic_dec_and_test(&vlan->refcount)) {
-		spin_lock_bh(&vlan->bat_priv->softif_vlan_list_lock);
-		hlist_del_rcu(&vlan->list);
-		spin_unlock_bh(&vlan->bat_priv->softif_vlan_list_lock);
+	if (atomic_dec_and_test(&softif_vlan->refcount)) {
+		spin_lock_bh(&softif_vlan->bat_priv->softif_vlan_list_lock);
+		hlist_del_rcu(&softif_vlan->list);
+		spin_unlock_bh(&softif_vlan->bat_priv->softif_vlan_list_lock);
 
-		kfree_rcu(vlan, rcu);
+		kfree_rcu(softif_vlan, rcu);
 	}
 }