The following commit has been merged in the next branch: commit 8bd9620303eee333e3915853ca64e722c57495dd Author: Paul E. McKenney paulmck@linux.vnet.ibm.com Date: Tue May 10 09:17:01 2011 +0200

batman-adv: convert call_rcu(softif_neigh_free_rcu) to kfree_rcu

The RCU callback softif_neigh_free_rcu() just calls kfree(), so we can use kfree_rcu() instead of call_rcu().

Signed-off-by: Paul E. McKenney paulmck@linux.vnet.ibm.com Cc: Marek Lindner lindner_marek@yahoo.de Cc: Simon Wunderlich siwu@hrz.tu-chemnitz.de Acked-by: David S. Miller davem@davemloft.net Reviewed-by: Josh Triplett josh@joshtriplett.org Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/soft-interface.c b/soft-interface.c index c76a33e..d5aa609 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -72,18 +72,10 @@ int my_skb_head_push(struct sk_buff *skb, unsigned int len) return 0; }

-static void softif_neigh_free_rcu(struct rcu_head *rcu) -{ - struct softif_neigh *softif_neigh; - - softif_neigh = container_of(rcu, struct softif_neigh, rcu); - kfree(softif_neigh); -} - static void softif_neigh_free_ref(struct softif_neigh *softif_neigh) { if (atomic_dec_and_test(&softif_neigh->refcount)) - call_rcu(&softif_neigh->rcu, softif_neigh_free_rcu); + kfree_rcu(softif_neigh, rcu); }

static void softif_neigh_vid_free_rcu(struct rcu_head *rcu)