espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 03:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ble_mesh_sync_zephyr_fixes_v3.3' into 'release/v3.3'

Browse Source 
Bugfix/ble mesh sync zephyr fixes (v3.3)

See merge request espressif/esp-idf!8950
This commit is contained in:
Island
2020-05-28 10:17:29 +08:00
parent a70c956a75 822b20eb40
commit 5f43d69d21
1 changed files with 6 additions and 4 deletions
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 */ new_key:1; /* New/old key */
u8_t nack_count; /* Number of unacked segs */ u8_t nack_count; /* Number of unacked segs */
u8_t ttl; u8_t ttl;
u8_t seg_pending:5, /* Number of segments pending */ u8_t seg_pending; /* Number of segments pending */
attempts:3; u8_t attempts; /* Transmit attempts */
const struct bt_mesh_send_cb *cb; const struct bt_mesh_send_cb *cb;
void *cb_data; void *cb_data;
struct k_delayed_work retransmit; /* Retransmit timer */ 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; 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); 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) static struct seg_tx *seg_tx_lookup(u16_t seq_zero, u8_t obo, u16_t addr)