Repository : ssh://git@open-mesh.org/batman-adv

On branch : maint

commit b53915310227cc9b029ba0fa5aae44e50a461f80 Author: Antonio Quartulli antonio@meshcoding.com Date: Thu May 15 11:08:07 2014 +0200

batman-adv: fix var name to keep compatibility with old kernels

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 Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

b53915310227cc9b029ba0fa5aae44e50a461f80 soft-interface.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

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); } }