michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: L2CAP: Remove unnecessary stack variables

Browse source 
Remove unnecessary bt_l2cap_chan or bt_l2cap_le_chan stack variables
from the code.

Change-Id: Icb306f075d90b67e00155696f8e25f58b89821b2
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2016-06-13 15:11:18 +03:00
commit b0d721c496
1 changed files with 18 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

46
net/bluetooth/l2cap.c
View file

@ -1061,18 +1061,12 @@ int bt_l2cap_update_conn_param(struct bt_conn *conn,
static void l2cap_connected(struct bt_l2cap_chan *chan) static void l2cap_connected(struct bt_l2cap_chan *chan)
{ {
struct bt_l2cap_le_chan *ch = LE_CHAN(chan); BT_DBG("ch %p cid 0x%04x", LE_CHAN(chan), LE_CHAN(chan)->rx.cid);
ARG_UNUSED(ch);
BT_DBG("ch %p cid 0x%04x", ch, ch->rx.cid);
} }
static void l2cap_disconnected(struct bt_l2cap_chan *chan) static void l2cap_disconnected(struct bt_l2cap_chan *chan)
{ {
struct bt_l2cap_le_chan *ch = LE_CHAN(chan); BT_DBG("ch %p cid 0x%04x", LE_CHAN(chan), LE_CHAN(chan)->rx.cid);
ARG_UNUSED(ch);
BT_DBG("ch %p cid 0x%04x", ch, ch->rx.cid);
} }
static int l2cap_accept(struct bt_conn *conn, struct bt_l2cap_chan **chan) static int l2cap_accept(struct bt_conn *conn, struct bt_l2cap_chan **chan)
@ -1155,10 +1149,9 @@ struct bt_l2cap_chan *bt_l2cap_le_lookup_rx_cid(struct bt_conn *conn,
} }
#if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL) #if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL)
static int l2cap_le_connect(struct bt_conn *conn, struct bt_l2cap_chan *chan, static int l2cap_le_connect(struct bt_conn *conn, struct bt_l2cap_le_chan *ch,
uint16_t psm) uint16_t psm)
{ {
struct bt_l2cap_le_chan *ch = LE_CHAN(chan);
struct net_buf *buf; struct net_buf *buf;
struct bt_l2cap_sig_hdr *hdr; struct bt_l2cap_sig_hdr *hdr;
struct bt_l2cap_le_conn_req *req; struct bt_l2cap_le_conn_req *req;
@ -1170,7 +1163,7 @@ static int l2cap_le_connect(struct bt_conn *conn, struct bt_l2cap_chan *chan,
l2cap_chan_tx_init(ch); l2cap_chan_tx_init(ch);
l2cap_chan_rx_init(ch); l2cap_chan_rx_init(ch);
if (!l2cap_chan_add(conn, chan)) { if (!l2cap_chan_add(conn, &ch->chan)) {
return -ENOMEM; return -ENOMEM;
} }
@ -1194,7 +1187,7 @@ static int l2cap_le_connect(struct bt_conn *conn, struct bt_l2cap_chan *chan,
req->mps = sys_cpu_to_le16(ch->rx.mps); req->mps = sys_cpu_to_le16(ch->rx.mps);
req->credits = sys_cpu_to_le16(L2CAP_LE_MAX_CREDITS); req->credits = sys_cpu_to_le16(L2CAP_LE_MAX_CREDITS);
bt_l2cap_send(chan->conn, BT_L2CAP_CID_LE_SIG, buf); bt_l2cap_send(ch->chan.conn, BT_L2CAP_CID_LE_SIG, buf);
return 0; return 0;
} }
@ -1218,7 +1211,7 @@ int bt_l2cap_chan_connect(struct bt_conn *conn, struct bt_l2cap_chan *chan,
} }
#endif /* CONFIG_BLUETOOTH_BREDR */ #endif /* CONFIG_BLUETOOTH_BREDR */
return l2cap_le_connect(conn, chan, psm); return l2cap_le_connect(conn, LE_CHAN(chan), psm);
} }
int bt_l2cap_chan_disconnect(struct bt_l2cap_chan *chan) int bt_l2cap_chan_disconnect(struct bt_l2cap_chan *chan)
@ -1264,11 +1257,10 @@ int bt_l2cap_chan_disconnect(struct bt_l2cap_chan *chan)
return 0; return 0;
} }
static struct net_buf *l2cap_chan_create_seg(struct bt_l2cap_chan *chan, static struct net_buf *l2cap_chan_create_seg(struct bt_l2cap_le_chan *ch,
struct net_buf *buf, struct net_buf *buf,
size_t sdu_hdr_len) size_t sdu_hdr_len)
{ {
struct bt_l2cap_le_chan *ch = LE_CHAN(chan);
struct net_buf *seg; struct net_buf *seg;
uint16_t headroom; uint16_t headroom;
uint16_t len; uint16_t len;
@ -1304,45 +1296,43 @@ segment:
memcpy(net_buf_add(seg, len), buf->data, len); memcpy(net_buf_add(seg, len), buf->data, len);
net_buf_pull(buf, len); net_buf_pull(buf, len);
BT_DBG("chan %p seg %p len %u", chan, seg, seg->len); BT_DBG("ch %p seg %p len %u", ch, seg, seg->len);
return seg; return seg;
} }
static int l2cap_chan_le_send(struct bt_l2cap_chan *chan, struct net_buf *buf, static int l2cap_chan_le_send(struct bt_l2cap_le_chan *ch, struct net_buf *buf,
uint16_t sdu_hdr_len) uint16_t sdu_hdr_len)
{ {
struct bt_l2cap_le_chan *ch = LE_CHAN(chan);
int len; int len;
/* Wait for credits */ /* Wait for credits */
nano_sem_take(&ch->tx.credits, TICKS_UNLIMITED); nano_sem_take(&ch->tx.credits, TICKS_UNLIMITED);
buf = l2cap_chan_create_seg(chan, buf, sdu_hdr_len); buf = l2cap_chan_create_seg(ch, buf, sdu_hdr_len);
if (!buf) { if (!buf) {
return -ENOMEM; return -ENOMEM;
} }
/* Channel may have been disconnected while waiting for credits */ /* Channel may have been disconnected while waiting for credits */
if (!chan->conn) { if (!ch->chan.conn) {
net_buf_unref(buf); net_buf_unref(buf);
return -ECONNRESET; return -ECONNRESET;
} }
BT_DBG("chan %p cid 0x%04x len %u credits %u", chan, ch->tx.cid, BT_DBG("ch %p cid 0x%04x len %u credits %u", ch, ch->tx.cid,
buf->len, ch->tx.credits.nsig); buf->len, ch->tx.credits.nsig);
len = buf->len; len = buf->len;
bt_l2cap_send(chan->conn, ch->tx.cid, buf); bt_l2cap_send(ch->chan.conn, ch->tx.cid, buf);
return len; return len;
} }
static int l2cap_chan_le_send_sdu(struct bt_l2cap_chan *chan, static int l2cap_chan_le_send_sdu(struct bt_l2cap_le_chan *ch,
struct net_buf *buf) struct net_buf *buf)
{ {
struct bt_l2cap_le_chan *ch = LE_CHAN(chan);
int ret, sent, total_len; int ret, sent, total_len;
if (buf->len > ch->tx.mtu) { if (buf->len > ch->tx.mtu) {
@ -1352,20 +1342,20 @@ static int l2cap_chan_le_send_sdu(struct bt_l2cap_chan *chan,
total_len = buf->len; total_len = buf->len;
/* Add SDU length for the first segment */ /* Add SDU length for the first segment */
ret = l2cap_chan_le_send(chan, buf, BT_L2CAP_SDU_HDR_LEN); ret = l2cap_chan_le_send(ch, buf, BT_L2CAP_SDU_HDR_LEN);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
/* Send remaining segments */ /* Send remaining segments */
for (sent = ret; sent < total_len; sent += ret) { for (sent = ret; sent < total_len; sent += ret) {
ret = l2cap_chan_le_send(chan, buf, 0); ret = l2cap_chan_le_send(ch, buf, 0);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
} }
BT_DBG("chan %p cid 0x%04x sent %u", chan, ch->tx.cid, sent); BT_DBG("ch %p cid 0x%04x sent %u", ch, ch->tx.cid, sent);
net_buf_unref(buf); net_buf_unref(buf);
@ -1392,7 +1382,7 @@ int bt_l2cap_chan_send(struct bt_l2cap_chan *chan, struct net_buf *buf)
} }
#endif /* CONFIG_BLUETOOTH_BREDR */ #endif /* CONFIG_BLUETOOTH_BREDR */
err = l2cap_chan_le_send_sdu(chan, buf); err = l2cap_chan_le_send_sdu(LE_CHAN(chan), buf);
if (err < 0) { if (err < 0) {
BT_ERR("failed to send message %d", err); BT_ERR("failed to send message %d", err);
} }