Merge branch 'mesh/bugfix_0628' into 'release/v3.2'

mesh: bugfix (backport3.2)

See merge request espressif/esp-idf!5402
This commit is contained in:
Jiang Jiang Jian 2019-07-05 22:43:16 +08:00
commit 4a9f339447
2 changed files with 8 additions and 1 deletions

View file

@ -1479,6 +1479,13 @@ esp_err_t esp_mesh_switch_channel(const uint8_t *new_bssid, int csa_newchan, int
*/
esp_err_t esp_mesh_get_router_bssid(uint8_t *router_bssid);
/**
* @brief Get the TSF time
*
* @return the TSF time
*/
int64_t esp_mesh_get_tsf_time(void);
#ifdef __cplusplus
}
#endif

@ -1 +1 @@
Subproject commit e5e3b12c31e4fe143aa1aabd94c8ffac93d76b5d
Subproject commit 3fdb9c146d540836e442d0130c37b57dde988b73