From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH-next] batman-adv: Remove unused compat function batadv_free_rcu_softif_vlan
Date: Wed, 22 Apr 2015 21:12:42 +0200 [thread overview]
Message-ID: <1429729962-5365-1-git-send-email-sven@narfation.org> (raw)
The commit e78c16c0550c ("batman-adv: Revert "fix var name to keep
compatibility with old kernels"") should have renamed the function to
batadv_free_rcu_softif_vlan instead of adding a new function
batadv_free_rcu_vlan because it was only used in this single place.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
This patch is complete optional and would only silence a build_test warning
until the master branch becomes the next branch. But this would create a merge
conflict because batadv_free_rcu_softif_vlan is already removed in master.
---
compat.c | 9 ---------
compat.h | 1 -
2 files changed, 10 deletions(-)
diff --git a/compat.c b/compat.c
index 516d06c..f8e213f 100644
--- a/compat.c
+++ b/compat.c
@@ -33,15 +33,6 @@ void batadv_free_rcu_orig_vlan(struct rcu_head *rcu)
kfree(vlan);
}
-void batadv_free_rcu_softif_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_vlan(struct rcu_head *rcu)
{
struct batadv_softif_vlan *vlan;
diff --git a/compat.h b/compat.h
index 94d0e85..d6ca427 100644
--- a/compat.h
+++ b/compat.h
@@ -226,7 +226,6 @@ static const struct { \
#define vlan_insert_tag(skb, proto, vid) __vlan_put_tag(skb, vid)
void batadv_free_rcu_orig_vlan(struct rcu_head *rcu);
-void batadv_free_rcu_softif_vlan(struct rcu_head *rcu);
void batadv_free_rcu_tt_global_entry(struct rcu_head *rcu);
void batadv_free_rcu_gw_node(struct rcu_head *rcu);
void batadv_free_rcu_tt_local_entry(struct rcu_head *rcu);
--
2.1.4
next reply other threads:[~2015-04-22 19:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-22 19:12 Sven Eckelmann [this message]
2015-04-23 3:17 ` [B.A.T.M.A.N.] [PATCH-next] batman-adv: Remove unused compat function batadv_free_rcu_softif_vlan Antonio Quartulli
2015-04-23 6:49 ` Sven Eckelmann
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=1429729962-5365-1-git-send-email-sven@narfation.org \
--to=sven@narfation.org \
--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