[commits] [batman-adv] next: batman-adv: Revert "fix var name to keep compatibility with old kernels" (e78c16c)

postmaster at open-mesh.org postmaster at open-mesh.org
Mon Apr 20 17:22:36 CEST 2015


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

On branch  : next

>---------------------------------------------------------------

commit e78c16c0550c4d058b0c8ae182fe7202e39fd9c4
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Apr 17 19:18:08 2015 +0200

    batman-adv: Revert "fix var name to keep compatibility with old kernels"
    
    The original patch b53915310227cc9b029ba0fa5aae44e50a461f80 should not be
    submitted to net-next. It can be better implemented using compat code.
    
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Acked-by: Antonio Quartulli <antonio at meshcoding.com>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>


>---------------------------------------------------------------

e78c16c0550c4d058b0c8ae182fe7202e39fd9c4
 compat.c         |    9 +++++++++
 compat.h         |    1 +
 soft-interface.c |   12 ++++++------
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/compat.c b/compat.c
index 3dbf9d2..516d06c 100644
--- a/compat.c
+++ b/compat.c
@@ -42,6 +42,15 @@ void batadv_free_rcu_softif_vlan(struct rcu_head *rcu)
 	kfree(vlan);
 }
 
+void batadv_free_rcu_vlan(struct rcu_head *rcu)
+{
+	struct batadv_softif_vlan *vlan;
+
+	vlan = container_of(rcu, struct batadv_softif_vlan, rcu);
+
+	kfree(vlan);
+}
+
 void batadv_free_rcu_tt_global_entry(struct rcu_head *rcu)
 {
 	struct batadv_tt_global_entry *global;
diff --git a/compat.h b/compat.h
index a5f027a..94d0e85 100644
--- a/compat.h
+++ b/compat.h
@@ -234,6 +234,7 @@ void batadv_free_rcu_backbone_gw(struct rcu_head *rcu);
 void batadv_free_rcu_dat_entry(struct rcu_head *rcu);
 void batadv_free_rcu_nc_path(struct rcu_head *rcu);
 void batadv_free_rcu_tvlv_handler(struct rcu_head *rcu);
+void batadv_free_rcu_vlan(struct rcu_head *rcu);
 
 static inline void skb_reset_mac_len(struct sk_buff *skb)
 {
diff --git a/soft-interface.c b/soft-interface.c
index 8748987..70edc41 100644
--- a/soft-interface.c
+++ b/soft-interface.c
@@ -453,14 +453,14 @@ out:
  *  possibly free it
  * @softif_vlan: the vlan object to release
  */
-void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *softif_vlan)
+void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *vlan)
 {
-	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);
+	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);
 
-		kfree_rcu(softif_vlan, rcu);
+		kfree_rcu(vlan, rcu);
 	}
 }
 



More information about the commits mailing list