]> granicus.if.org Git - esp-idf/commit
Merge branch 'bug/ets_timer_crash' into 'master'
authorJiang Jiang Jian <jack@espressif.com>
Thu, 12 Jan 2017 13:33:28 +0000 (21:33 +0800)
committerJiang Jiang Jian <jack@espressif.com>
Thu, 12 Jan 2017 13:33:28 +0000 (21:33 +0800)
commitee9fb10e29adfcd74817a551f9343f77d58f703f
treef6a3d3dd3dd8886fb15828c2d19dae36b89304f7
parent9052c6e9eefed4e031d41546ce70fc8d35f23a5e
parent6eedbfa9beb290d36a4c53ea698c66a6443d0710
Merge branch 'bug/ets_timer_crash' into 'master'

tw9503: fix ets timer crash bug

1. tw9503: call ets_timer_disarm before calling ets_timer_setfn

2. change CHECK_AP_CONN to CHECK_STA_CONN

See merge request !414