Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f427604 authored by Marek Lindner's avatar Marek Lindner Committed by Greg Kroah-Hartman
Browse files

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

parent b4abfcd4
Loading
Loading
Loading
Loading
+10 −2
Original line number Diff line number Diff line
@@ -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)
+0 −1
Original line number Diff line number Diff line
@@ -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 −0
Original line number Diff line number Diff line
@@ -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;
};

/**