From 299216b2f0b4f1ee6919af8cb7933d8c553fb31d Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Fri, 2 Dec 2016 08:41:48 +0000 Subject: [PATCH] Bluetooth: Controller: Make use of min() convenience macro Instead of having custom logic for determining the minimum of two values, use the existing min() helper from misc/util.h. Change-Id: I9809883d4a31126329373f293897dd49eb91e9ad Signed-off-by: Johan Hedberg --- subsys/bluetooth/controller/ll/ctrl.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/subsys/bluetooth/controller/ll/ctrl.c b/subsys/bluetooth/controller/ll/ctrl.c index 8327ae93a3e..843a6fa9b96 100644 --- a/subsys/bluetooth/controller/ll/ctrl.c +++ b/subsys/bluetooth/controller/ll/ctrl.c @@ -19,6 +19,7 @@ #include #include +#include #include #include @@ -1260,20 +1261,14 @@ static inline void isr_rx_conn_pkt_ctrl_dle(struct pdu_data *pdu_data_rx, /* use the minimal of our default_tx_octets and * peer max_rx_octets */ - if (lr->max_rx_octets > _radio.conn_curr->default_tx_octets) { - eff_tx_octets = _radio.conn_curr->default_tx_octets; - } else { - eff_tx_octets = lr->max_rx_octets; - } + eff_tx_octets = min(lr->max_rx_octets, + _radio.conn_curr->default_tx_octets); /* use the minimal of our max supported and * peer max_tx_octets */ - if (lr->max_tx_octets > RADIO_LL_LENGTH_OCTETS_RX_MAX) { - eff_rx_octets = RADIO_LL_LENGTH_OCTETS_RX_MAX; - } else { - eff_rx_octets = lr->max_tx_octets; - } + eff_rx_octets = min(lr->max_tx_octets, + RADIO_LL_LENGTH_OCTETS_RX_MAX); /* check if change in rx octets */ if (eff_rx_octets != _radio.conn_curr->max_rx_octets) {