[mynewt-nimble] 01/02: Revert "nimble/ll: Fix encrypted data PDU payload length calculation"

[an...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git

commit 513ea2738655bb10010dcf1d7e646b6e1ed3a355
Author: Andrzej Kaczmarek <an...@codecoup.pl>
AuthorDate: Mon Nov 8 11:23:14 2021 +0100

    Revert "nimble/ll: Fix encrypted data PDU payload length calculation"
    
    This reverts commit c185dd6719b1cc9e08abada79e16e866118d3501.
---
 nimble/controller/src/ble_ll_conn.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/nimble/controller/src/ble_ll_conn.c b/nimble/controller/src/ble_ll_conn.c
index ebeddd7..20b578a 100644
--- a/nimble/controller/src/ble_ll_conn.c
+++ b/nimble/controller/src/ble_ll_conn.c
@@ -855,7 +855,6 @@ static uint16_t
 ble_ll_conn_adjust_pyld_len(struct ble_ll_conn_sm *connsm, uint16_t pyld_len)
 {
     uint16_t phy_max_tx_octets;
-    uint16_t mic_len;
     uint16_t ret;
 
 #if (BLE_LL_BT5_PHY_SUPPORTED == 1)
@@ -878,19 +877,11 @@ ble_ll_conn_adjust_pyld_len(struct ble_ll_conn_sm *connsm, uint16_t pyld_len)
 
     ret = pyld_len;
 
-    mic_len = 0;
-#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
-    if (CONN_F_ENCRYPTED(connsm)) {
-        mic_len = BLE_LL_DATA_MIC_LEN;
-    }
-#endif
-
-
-    if (ret > connsm->eff_max_tx_octets - mic_len) {
+    if (ret > connsm->eff_max_tx_octets) {
         ret = connsm->eff_max_tx_octets;
     }
 
-    if (ret > phy_max_tx_octets - mic_len) {
+    if (ret > phy_max_tx_octets) {
         ret = phy_max_tx_octets;
     }