The following commit has been merged in the master branch: commit 7f32f2e8d97150ba5b80410dda86b01b0879fe8d Author: Marek Lindner lindner_marek@yahoo.de Date: Sat Oct 9 11:44:44 2010 +0000

batman-adv: use rcu callbacks when freeing batman_if

Signed-off-by: Marek Lindner lindner_marek@yahoo.de

diff --git a/hard-interface.c b/hard-interface.c index 87693db..ec16dc9 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -38,6 +38,15 @@ /* protect update critical side of if_list - but not the content */ static DEFINE_SPINLOCK(if_list_lock);

+static void hardif_free_rcu(struct rcu_head *rcu) +{ + struct batman_if *batman_if; + + batman_if = container_of(rcu, struct batman_if, rcu); + sysfs_del_hardif(&batman_if->hardif_obj); + kref_put(&batman_if->refcount, hardif_free_ref); +} + struct batman_if *get_batman_if_by_netdev(struct net_device *net_dev) { struct batman_if *batman_if; @@ -464,9 +473,7 @@ static void hardif_remove_interface(struct batman_if *batman_if)

/* caller must take if_list_lock */ list_del_rcu(&batman_if->list); - synchronize_rcu(); - sysfs_del_hardif(&batman_if->hardif_obj); - kref_put(&batman_if->refcount, hardif_free_ref); + call_rcu(&batman_if->rcu, hardif_free_rcu); }

void hardif_remove_interfaces(void) diff --git a/types.h b/types.h index fcb36ea..dec2791 100644 --- a/types.h +++ b/types.h @@ -47,6 +47,7 @@ struct batman_if { struct kref refcount; struct packet_type batman_adv_ptype; struct net_device *soft_iface; + struct rcu_head rcu; };

/**