Просмотр исходного кода

Merge branch 'bugfix/fix_long_time_to_get_ip' into 'master'

LWIP: fix the bug that long time to get IP

Closes WIFI-4932

See merge request espressif/esp-idf!20656
Jiang Jiang Jian 3 лет назад
Родитель
Сommit
ed36caabfd
2 измененных файлов с 4 добавлено и 2 удалено
  1. 1 1
      components/lwip/lwip
  2. 3 1
      components/lwip/port/esp32/include/lwipopts.h

+ 1 - 1
components/lwip/lwip

@@ -1 +1 @@
-Subproject commit c3e9aa1cef98fd8d87dabadc472c5268eae28319
+Subproject commit 33912690ea005e8ff05b2c579ebbf0a4189c3b00

+ 3 - 1
components/lwip/port/esp32/include/lwipopts.h

@@ -344,7 +344,9 @@ extern "C" {
 /* Since for embedded devices it's not that hard to miss a discover packet, so lower
  * the discover retry backoff time from (2,4,8,16,32,60,60)s to (500m,1,2,4,8,15,15)s.
  */
-#define DHCP_REQUEST_TIMEOUT_SEQUENCE(tries)   (( (tries) < 6 ? 1 << (tries) : 60) * 250)
+#define DHCP_REQUEST_TIMEOUT_SEQUENCE(state, tries)   (state == DHCP_STATE_REQUESTING ? \
+                                                       (uint16_t)(1 * 1000) : \
+                                                       (uint16_t)(((tries) < 6 ? 1 << (tries) : 60) * 250))
 
 static inline uint32_t timeout_from_offered(uint32_t lease, uint32_t min)
 {