espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 21:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/esp_netif_minor_fixes' into 'master'

Browse Source 
esp-netif: Minor fixes

Closes IDFGH-3311

See merge request espressif/esp-idf!8799
This commit is contained in:
David Čermák
2020-05-20 12:47:01 +08:00
parent af97a5abc3 95b5ef3687
commit 7d7f3f8d8f
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_netif/lwip/esp_netif_lwip.c
View File

@@ -614,7 +614,7 @@ static esp_err_t esp_netif_start_api(esp_netif_api_msg_t *msg)
#if ESP_GRATUITOUS_ARP #if ESP_GRATUITOUS_ARP
netif_set_garp_flag(esp_netif->lwip_netif); netif_set_garp_flag(esp_netif->lwip_netif);
#else #else
ESP_LOGW(TAG,"CONFIG_LWIP_ESP_GRATUITOUS_ARP not enabled, but esp-netif configured woth ESP_NETIF_FLAG_GARP") ESP_LOGW(TAG,"CONFIG_LWIP_ESP_GRATUITOUS_ARP not enabled, but esp-netif configured with ESP_NETIF_FLAG_GARP");
#endif #endif
} }
struct netif *p_netif = esp_netif->lwip_netif; struct netif *p_netif = esp_netif->lwip_netif;

7
components/tcpip_adapter/tcpip_adapter_compat.c
View File

@@ -178,7 +178,12 @@ esp_err_t tcpip_adapter_set_default_wifi_handlers(void)
esp_err_t tcpip_adapter_clear_default_wifi_handlers(void) esp_err_t tcpip_adapter_clear_default_wifi_handlers(void)
{ {
return _esp_wifi_clear_default_wifi_handlers(); if (s_tcpip_adapter_compat) {
// Clear default handlers only if tcpip-adapter mode used
return _esp_wifi_clear_default_wifi_handlers();
}
// No action if tcpip-adapter compatibility enabled, but interfaces created/configured with esp-netif
return ESP_OK;
} }
tcpip_adapter_if_t tcpip_adapter_if_from_esp_netif(esp_netif_t *esp_netif) tcpip_adapter_if_t tcpip_adapter_if_from_esp_netif(esp_netif_t *esp_netif)