From fa9d41f39b1d1c2fbac80ae63cd357581fdab8e3 Mon Sep 17 00:00:00 2001 From: Aleksander Wasaznik Date: Thu, 9 Mar 2023 06:32:49 +0100 Subject: [PATCH] Bluetooth: Host: Add helper `bt_att_is_enhanced` This is a refactor. Hopefully, it makes the code easier to maintain. Signed-off-by: Aleksander Wasaznik --- subsys/bluetooth/host/att.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/subsys/bluetooth/host/att.c b/subsys/bluetooth/host/att.c index 8383313650fc5d..89656808b4980c 100644 --- a/subsys/bluetooth/host/att.c +++ b/subsys/bluetooth/host/att.c @@ -95,6 +95,16 @@ struct bt_att_chan { sys_snode_t node; }; +static bool bt_att_is_enhanced(struct bt_att_chan *chan) +{ + /* Optimization. */ + if (!IS_ENABLED(CONFIG_BT_EATT)) { + return false; + } + + return atomic_test_bit(chan->flags, ATT_ENHANCED); +} + static uint16_t bt_att_mtu(struct bt_att_chan *chan) { return chan->chan.tx.mtu; @@ -3039,11 +3049,8 @@ static void bt_att_connected(struct bt_l2cap_chan *chan) atomic_set_bit(att_chan->flags, ATT_CONNECTED); - if (0) { -#if defined(CONFIG_BT_EATT) - } else if (atomic_test_bit(att_chan->flags, ATT_ENHANCED)) { + if (bt_att_is_enhanced(att_chan)) { cap_eatt_mtu(le_chan); -#endif } else { le_chan->tx.mtu = BT_ATT_DEFAULT_LE_MTU; le_chan->rx.mtu = BT_ATT_DEFAULT_LE_MTU;