diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2014-11-11 07:16:29 -0500 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-11-11 08:26:02 -0500 |
commit | 4e7902267708e5a389398d9014455b2ed4892912 (patch) | |
tree | 4b2c2592b7ec5d4a01545698b0d062ddbe942646 /net | |
parent | 60cb49d2c92969f7b0e7da863fc0cbe3ec0c715c (diff) |
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: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/bluetooth/6lowpan.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c index 3f20dce9d671..3d8ceb251d75 100644 --- a/net/bluetooth/6lowpan.c +++ b/net/bluetooth/6lowpan.c | |||
@@ -87,13 +87,6 @@ struct lowpan_dev { | |||
87 | struct delayed_work notify_peers; | 87 | struct delayed_work notify_peers; |
88 | }; | 88 | }; |
89 | 89 | ||
90 | static inline void peer_free(struct rcu_head *head) | ||
91 | { | ||
92 | struct lowpan_peer *e = container_of(head, struct lowpan_peer, rcu); | ||
93 | |||
94 | kfree(e); | ||
95 | } | ||
96 | |||
97 | static inline struct lowpan_dev *lowpan_dev(const struct net_device *netdev) | 90 | static inline struct lowpan_dev *lowpan_dev(const struct net_device *netdev) |
98 | { | 91 | { |
99 | return netdev_priv(netdev); | 92 | return netdev_priv(netdev); |
@@ -108,7 +101,7 @@ static inline void peer_add(struct lowpan_dev *dev, struct lowpan_peer *peer) | |||
108 | static inline bool peer_del(struct lowpan_dev *dev, struct lowpan_peer *peer) | 101 | static inline bool peer_del(struct lowpan_dev *dev, struct lowpan_peer *peer) |
109 | { | 102 | { |
110 | list_del_rcu(&peer->list); | 103 | list_del_rcu(&peer->list); |
111 | call_rcu(&peer->rcu, peer_free); | 104 | kfree_rcu(peer, rcu); |
112 | 105 | ||
113 | module_put(THIS_MODULE); | 106 | module_put(THIS_MODULE); |
114 | 107 | ||
@@ -1219,7 +1212,7 @@ static void disconnect_all_peers(void) | |||
1219 | l2cap_chan_close(peer->chan, ENOENT); | 1212 | l2cap_chan_close(peer->chan, ENOENT); |
1220 | 1213 | ||
1221 | list_del_rcu(&peer->list); | 1214 | list_del_rcu(&peer->list); |
1222 | call_rcu(&peer->rcu, peer_free); | 1215 | kfree_rcu(peer, rcu); |
1223 | 1216 | ||
1224 | module_put(THIS_MODULE); | 1217 | module_put(THIS_MODULE); |
1225 | } | 1218 | } |