espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-10-18 03:07:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

This closes #172.

Browse Source 
Merge remote-tracking branch 'rymanluk/fixes' into develop

* rymanluk/fixes:
  nimble/ll: Fix for compiler warning
  nordic/i2c: Fix for compiler warning

X-Original-Commit: 5b09171d2413aaeaaa719641fca3818006086fcf
This commit is contained in:
Christopher Collins
2017-02-01 11:15:32 -08:00
parent 73ef029935 b0008ee365
commit 5bbb7a12c1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/controller/src/ble_ll_conn.c
+2 -2
View File
@@ -2251,7 +2251,7 @@ ble_ll_init_rx_isr_end(uint8_t *rxbuf, uint8_t crcok,
uint8_t peer_addr_type; uint8_t peer_addr_type;
uint8_t *adv_addr; uint8_t *adv_addr;
uint8_t *peer; uint8_t *peer;
uint8_t *init_addr; uint8_t *init_addr = NULL;
uint8_t pyld_len; uint8_t pyld_len;
uint8_t inita_is_rpa; uint8_t inita_is_rpa;
uint32_t endtime; uint32_t endtime;
@@ -2360,7 +2360,7 @@ ble_ll_init_rx_isr_end(uint8_t *rxbuf, uint8_t crcok,
* If the inita is a RPA, we must see if it resolves based on the * If the inita is a RPA, we must see if it resolves based on the
* identity address of the resolved ADVA. * identity address of the resolved ADVA.
*/ */
if (inita_is_rpa) { if (init_addr && inita_is_rpa) {
if ((index < 0) || if ((index < 0) ||
!ble_ll_resolv_rpa(init_addr, !ble_ll_resolv_rpa(init_addr,
g_ble_ll_resolv_list[index].rl_local_irk)) { g_ble_ll_resolv_list[index].rl_local_irk)) {