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

Commit 4e790226 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: 6lowpan: Remove unnecessary RCU callback 



When kfree() is all that's needed to free an object protected by RCU
there's a kfree_rcu() convenience function that can be used. This patch
updates the 6lowpan code to use this, thereby eliminating the need for
the separate peer_free() function.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 60cb49d2

net/bluetooth/6lowpan.c

+2 −9
Original line number Diff line number Diff line
@@ -87,13 +87,6 @@ struct lowpan_dev { 
	struct delayed_work notify_peers;

};



static inline void peer_free(struct rcu_head *head)

{

	struct lowpan_peer *e = container_of(head, struct lowpan_peer, rcu);



	kfree(e);

}



static inline struct lowpan_dev *lowpan_dev(const struct net_device *netdev)

{

	return netdev_priv(netdev);
@@ -108,7 +101,7 @@ static inline void peer_add(struct lowpan_dev *dev, struct lowpan_peer *peer) 
static inline bool peer_del(struct lowpan_dev *dev, struct lowpan_peer *peer)

{

	list_del_rcu(&peer->list);

	call_rcu(&peer->rcu, peer_free);

	kfree_rcu(peer, rcu);



	module_put(THIS_MODULE);
@@ -1219,7 +1212,7 @@ static void disconnect_all_peers(void) 
		l2cap_chan_close(peer->chan, ENOENT);



		list_del_rcu(&peer->list);

		call_rcu(&peer->rcu, peer_free);

		kfree_rcu(peer, rcu);



		module_put(THIS_MODULE);

	}