leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Staging: batman-adv: use rcu callbacks when freeing batman_if

Browse Source 
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Marek Lindner 2010-11-22 00:55:44 +01:00 committed by Greg Kroah-Hartman
parent b4abfcd4c7
commit 3f427604d6
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/batman-adv/hard-interface.c
View File

@ -36,6 +36,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);
dev_put(batman_if->net_dev);
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;
@ -462,9 +471,8 @@ static void hardif_remove_interface(struct batman_if *batman_if)
return;
batman_if->if_status = IF_TO_BE_REMOVED;
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)

1
drivers/staging/batman-adv/hard-interface.h
View File

@ -47,7 +47,6 @@ static inline void hardif_free_ref(struct kref *refcount)
struct batman_if *batman_if;
batman_if = container_of(refcount, struct batman_if, refcount);
dev_put(batman_if->net_dev);
kfree(batman_if);
}

1
drivers/staging/batman-adv/types.h
View File

@ -46,6 +46,7 @@ struct batman_if {
struct kref refcount;
struct packet_type batman_adv_ptype;
struct net_device *soft_iface;
struct rcu_head rcu;
};
/**