michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: L2CAP: Make l2cap_chan_add initialize the destroy callback

Browse source 
This is cleaner and safer as destroy is garanteed to be initialized once
it is added to the list of channels.

Change-Id: Iae674f6e25527d71c03c5903337b0bd18c3dd0be
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Luiz Augusto von Dentz 2016-07-08 16:30:58 +03:00 • committed by Johan Hedberg
commit 2329d82432
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
net/bluetooth/l2cap.c
View file

@ -198,7 +198,8 @@ static void l2cap_rtx_timeout(struct nano_work *work)
l2cap_chan_del(&chan->chan);
}
static bool l2cap_chan_add(struct bt_conn *conn, struct bt_l2cap_chan *chan)
static bool l2cap_chan_add(struct bt_conn *conn, struct bt_l2cap_chan *chan,
void (*destroy)(struct bt_l2cap_chan *chan))
{
struct bt_l2cap_le_chan *ch = l2cap_chan_alloc_cid(conn, chan);
@ -211,6 +212,7 @@ static bool l2cap_chan_add(struct bt_conn *conn, struct bt_l2cap_chan *chan)
chan->_next = conn->channels;
conn->channels = chan;
chan->conn = conn;
chan->destroy = destroy;
nano_delayed_work_init(&ch->rtx_work, l2cap_rtx_timeout);
@ -248,7 +250,7 @@ void bt_l2cap_connected(struct bt_conn *conn)
ch->rx.cid = fchan->cid;
ch->tx.cid = fchan->cid;
if (!l2cap_chan_add(conn, chan)) {
if (!l2cap_chan_add(conn, chan, NULL)) {
return;
}
@ -571,11 +573,9 @@ static void le_conn_req(struct bt_l2cap *l2cap, uint8_t ident,
goto rsp;
}
if (l2cap_chan_add(conn, chan)) {
if (l2cap_chan_add(conn, chan, l2cap_chan_destroy)) {
struct bt_l2cap_le_chan *ch = BT_L2CAP_LE_CHAN(chan);
chan->destroy = l2cap_chan_destroy;
/* Init TX parameters */
l2cap_chan_tx_init(ch);
ch->tx.cid = scid;
@ -1218,12 +1218,10 @@ static int l2cap_le_connect(struct bt_conn *conn, struct bt_l2cap_le_chan *ch,
l2cap_chan_tx_init(ch);
l2cap_chan_rx_init(ch);
if (!l2cap_chan_add(conn, &ch->chan)) {
if (!l2cap_chan_add(conn, &ch->chan, l2cap_chan_destroy)) {
return -ENOMEM;
}
ch->chan.destroy = l2cap_chan_destroy;
buf = bt_l2cap_create_pdu(&le_sig);
if (!buf) {
BT_ERR("Unable to send L2CAP connection request");