From patchwork Thu May 15 09:08:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 3967 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=178.209.62.157; helo=s3.neomailbox.net; envelope-from=antonio@meshcoding.com; receiver=b.a.t.m.a.n@lists.open-mesh.org Received: from s3.neomailbox.net (s3.neomailbox.net [178.209.62.157]) by open-mesh.org (Postfix) with ESMTPS id 4743C600B71 for ; Thu, 15 May 2014 11:09:13 +0200 (CEST) From: Antonio Quartulli To: b.a.t.m.a.n@lists.open-mesh.org Date: Thu, 15 May 2014 11:08:07 +0200 Message-Id: <1400144887-24455-2-git-send-email-antonio@meshcoding.com> In-Reply-To: <1400144887-24455-1-git-send-email-antonio@meshcoding.com> References: <1400144887-24455-1-git-send-email-antonio@meshcoding.com> Cc: Antonio Quartulli Subject: [B.A.T.M.A.N.] [PATCH maint 2/2] batman-adv: fix var name to keep compatibility with old kernels X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 May 2014 09:09:14 -0000 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 --- 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); } }