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