michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: L2CAP: Replace checks for CONFIG_BT_CENTRAL

Browse source 
Make use of IS_ENABLED so the compiler do its job to remove any dead
code.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Luiz Augusto von Dentz 2019-10-04 11:44:27 +03:00 • committed by Johan Hedberg
commit 8d2cb14b17
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
subsys/bluetooth/host/l2cap.c
View file

@ -534,7 +534,6 @@ static void le_conn_param_rsp(struct bt_l2cap *l2cap, struct net_buf *buf)
BT_DBG("LE conn param rsp result %u", sys_le16_to_cpu(rsp->result)); BT_DBG("LE conn param rsp result %u", sys_le16_to_cpu(rsp->result));
} }
#if defined(CONFIG_BT_CENTRAL)
static void le_conn_param_update_req(struct bt_l2cap *l2cap, u8_t ident, static void le_conn_param_update_req(struct bt_l2cap *l2cap, u8_t ident,
struct net_buf *buf) struct net_buf *buf)
{ {
@ -585,7 +584,6 @@ static void le_conn_param_update_req(struct bt_l2cap *l2cap, u8_t ident,
bt_conn_le_conn_update(conn, &param); bt_conn_le_conn_update(conn, &param);
} }
} }
#endif /* CONFIG_BT_CENTRAL */
struct bt_l2cap_chan *bt_l2cap_le_lookup_tx_cid(struct bt_conn *conn, struct bt_l2cap_chan *bt_l2cap_le_lookup_tx_cid(struct bt_conn *conn,
u16_t cid) u16_t cid)
@ -1395,11 +1393,6 @@ static int l2cap_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
case BT_L2CAP_CONN_PARAM_RSP: case BT_L2CAP_CONN_PARAM_RSP:
le_conn_param_rsp(l2cap, buf); le_conn_param_rsp(l2cap, buf);
break; break;
#if defined(CONFIG_BT_CENTRAL)
case BT_L2CAP_CONN_PARAM_REQ:
le_conn_param_update_req(l2cap, hdr->ident, buf);
break;
#endif /* CONFIG_BT_CENTRAL */
#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) #if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL)
case BT_L2CAP_LE_CONN_REQ: case BT_L2CAP_LE_CONN_REQ:
le_conn_req(l2cap, hdr->ident, buf); le_conn_req(l2cap, hdr->ident, buf);
@ -1424,6 +1417,12 @@ static int l2cap_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
/* Ignored */ /* Ignored */
break; break;
#endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */ #endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */
case BT_L2CAP_CONN_PARAM_REQ:
if (IS_ENABLED(CONFIG_BT_CENTRAL)) {
le_conn_param_update_req(l2cap, hdr->ident, buf);
break;
}
/* Fall-through */
default: default:
BT_WARN("Unknown L2CAP PDU code 0x%02x", hdr->code); BT_WARN("Unknown L2CAP PDU code 0x%02x", hdr->code);
l2cap_send_reject(chan->conn, hdr->ident, l2cap_send_reject(chan->conn, hdr->ident,