Skip to content

Bluetooth: shell: Fix deadlock when receiving L2CAP packet #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jhedberg merged 4 commits into from
May 4, 2017
Merged

Bluetooth: shell: Fix deadlock when receiving L2CAP packet #66

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dacca91
Bluetooth: shell: Fix deadlock when receiving L2CAP packet
Vudentz May 3, 2017
b1fd65c
Merge branch 'master' into master
jhedberg May 3, 2017
4fc838d
Merge branch 'master' into master
jhedberg May 3, 2017
34cb77f
Merge branch 'master' into master
jhedberg May 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions tests/bluetooth/shell/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ static bt_addr_le_t id_addr;
static struct bt_conn *pairing_conn;

#if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL)
NET_BUF_POOL_DEFINE(data_pool, 1, DATA_MTU, BT_BUF_USER_DATA_MIN, NULL);
NET_BUF_POOL_DEFINE(data_tx_pool, 1, DATA_MTU, BT_BUF_USER_DATA_MIN, NULL);
NET_BUF_POOL_DEFINE(data_rx_pool, 1, DATA_MTU, BT_BUF_USER_DATA_MIN, NULL);
#endif

#if defined(CONFIG_BLUETOOTH_BREDR)
Expand Down Expand Up @@ -2055,7 +2056,7 @@ static struct net_buf *l2cap_alloc_buf(struct bt_l2cap_chan *chan)
{
printk("Channel %p requires buffer\n", chan);

return net_buf_alloc(&data_pool, K_FOREVER);
return net_buf_alloc(&data_rx_pool, K_FOREVER);
}

static struct bt_l2cap_chan_ops l2cap_ops = {
Expand Down Expand Up @@ -2172,7 +2173,7 @@ static int cmd_l2cap_send(int argc, char *argv[])
len = min(l2cap_chan.tx.mtu, DATA_MTU - BT_L2CAP_CHAN_SEND_RESERVE);

while (count--) {
buf = net_buf_alloc(&data_pool, K_FOREVER);
buf = net_buf_alloc(&data_tx_pool, K_FOREVER);
net_buf_reserve(buf, BT_L2CAP_CHAN_SEND_RESERVE);

net_buf_add_mem(buf, buf_data, len);
Expand Down