Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

[platform/kernel/linux-starfive.git] / net / batman-adv / originator.c

diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index 080ec88..40a30bb 100644 (file)
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -54,18 +54,10 @@ err:
        return 0;
 }
 
-static void neigh_node_free_rcu(struct rcu_head *rcu)
-{
-       struct neigh_node *neigh_node;
-
-       neigh_node = container_of(rcu, struct neigh_node, rcu);
-       kfree(neigh_node);
-}
-
 void neigh_node_free_ref(struct neigh_node *neigh_node)
 {
        if (atomic_dec_and_test(&neigh_node->refcount))
-               call_rcu(&neigh_node->rcu, neigh_node_free_rcu);
+               kfree_rcu(neigh_node, rcu);
 }
 
 /* increases the refcounter of a found router */