From: Antonio Quartulli <antonio@meshcoding.com>
To: b.a.t.m.a.n@lists.open-mesh.org
Cc: Antonio Quartulli <antonio@meshcoding.com>
Subject: [B.A.T.M.A.N.] [PATCH maint 2/2] batman-adv: fix var name to keep compatibility with old kernels
Date: Thu, 15 May 2014 11:08:07 +0200 [thread overview]
Message-ID: <1400144887-24455-2-git-send-email-antonio@meshcoding.com> (raw)
In-Reply-To: <1400144887-24455-1-git-send-email-antonio@meshcoding.com>
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(-)
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);
}
}
--
1.8.5.5
next prev parent reply other threads:[~2014-05-15 9:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-15 9:08 [B.A.T.M.A.N.] [PATCH maint 1/2] batman-adv: fix alignment Antonio Quartulli
2014-05-15 9:08 ` Antonio Quartulli [this message]
2014-05-15 18:57 ` [B.A.T.M.A.N.] [PATCH maint 2/2] batman-adv: fix var name to keep compatibility with old kernels Marek Lindner
2014-05-15 18:55 ` [B.A.T.M.A.N.] [PATCH maint 1/2] batman-adv: fix alignment Marek Lindner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1400144887-24455-2-git-send-email-antonio@meshcoding.com \
--to=antonio@meshcoding.com \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).