Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/ble_mesh_sync_zephyr_fixes_v4.0' into 'release/v4.0'

Browse source 
Bugfix/ble mesh sync zephyr fixes (v4.0)

See merge request espressif/esp-idf!8949
This commit is contained in:
Island 2020-05-28 10:16:52 +08:00
commit 59e11421bf
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
components/bt/esp_ble_mesh/mesh_core/transport.c
View file

@ -80,8 +80,8 @@ static struct seg_tx {
new_key:1; /* New/old key */
u8_t nack_count; /* Number of unacked segs */
u8_t ttl;
u8_t seg_pending:5, /* Number of segments pending */
attempts:3;
u8_t seg_pending; /* Number of segments pending */
u8_t attempts; /* Transmit attempts */
const struct bt_mesh_send_cb *cb;
void *cb_data;
struct k_delayed_work retransmit; /* Retransmit timer */
@ -837,9 +837,11 @@ static int sdu_recv(struct bt_mesh_net_rx *rx, u32_t seq, u8_t hdr,
return 0;
}
BT_WARN("%s, No matching AppKey", __func__);
if (rx->local_match) {
BT_WARN("%s, No matching AppKey", __func__);
}
bt_mesh_free_buf(sdu);
return -EINVAL;
return 0;
}
static struct seg_tx *seg_tx_lookup(u16_t seq_zero, u8_t obo, u16_t addr)