Commit 30648372 authored by Jaganath Kanakkassery's avatar Jaganath Kanakkassery Committed by Gustavo Padovan

Bluetooth: Move l2cap_chan_hold/put to l2cap_core.c

Refactor the code in order to use the l2cap_chan_destroy()
from l2cap_chan_put() under the refcnt protection.
Signed-off-by: default avatarJaganath Kanakkassery <jaganath.k@samsung.com>
Signed-off-by: default avatarSyam Sidhardhan <s.syam@samsung.com>
Reviewed-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent ee72d150
...@@ -671,20 +671,8 @@ enum { ...@@ -671,20 +671,8 @@ enum {
L2CAP_EV_RECV_FRAME, L2CAP_EV_RECV_FRAME,
}; };
static inline void l2cap_chan_hold(struct l2cap_chan *c) void l2cap_chan_hold(struct l2cap_chan *c);
{ void l2cap_chan_put(struct l2cap_chan *c);
BT_DBG("chan %p orig refcnt %d", c, atomic_read(&c->refcnt));
atomic_inc(&c->refcnt);
}
static inline void l2cap_chan_put(struct l2cap_chan *c)
{
BT_DBG("chan %p orig refcnt %d", c, atomic_read(&c->refcnt));
if (atomic_dec_and_test(&c->refcnt))
kfree(c);
}
static inline void l2cap_chan_lock(struct l2cap_chan *chan) static inline void l2cap_chan_lock(struct l2cap_chan *chan)
{ {
......
...@@ -425,6 +425,21 @@ void l2cap_chan_destroy(struct l2cap_chan *chan) ...@@ -425,6 +425,21 @@ void l2cap_chan_destroy(struct l2cap_chan *chan)
l2cap_chan_put(chan); l2cap_chan_put(chan);
} }
void l2cap_chan_hold(struct l2cap_chan *c)
{
BT_DBG("chan %p orig refcnt %d", c, atomic_read(&c->refcnt));
atomic_inc(&c->refcnt);
}
void l2cap_chan_put(struct l2cap_chan *c)
{
BT_DBG("chan %p orig refcnt %d", c, atomic_read(&c->refcnt));
if (atomic_dec_and_test(&c->refcnt))
kfree(c);
}
void l2cap_chan_set_defaults(struct l2cap_chan *chan) void l2cap_chan_set_defaults(struct l2cap_chan *chan)
{ {
chan->fcs = L2CAP_FCS_CRC16; chan->fcs = L2CAP_FCS_CRC16;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment