Merge branch 'mesh/bugfix_0628_v3.3' into 'release/v3.3'

mesh: bugfix (backport 3.3)

See merge request espressif/esp-idf!5438
This commit is contained in:
Jiang Jiang Jian 2019-07-05 22:33:24 +08:00
commit db38c37cf7
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 fc518f822e23b6f4fd8870d61cb1dba107727df2
Subproject commit 01f64a4d5371874ad3e8c78269329a50ce94f60f