espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 11:44:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ppp_netif_free_v4.2' into 'release/v4.2'

Browse Source 
esp-modem: Remove esp-netif destroy from modem network glue code (v4.2)

See merge request espressif/esp-idf!11872
This commit is contained in:
David Čermák
2021-01-16 00:57:15 +08:00
parent 67a3ff8a4b 53fc156adb
commit 28371f45a4
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/protocols/pppos_client/components/modem/src/esp_modem_netif.c
View File

@@ -109,7 +109,6 @@ drv_create_failed:
void esp_modem_netif_teardown(void *h) void esp_modem_netif_teardown(void *h)
{ {
esp_modem_netif_driver_t *driver = h; esp_modem_netif_driver_t *driver = h;
esp_netif_destroy(driver->base.netif);
free(driver); free(driver);
} }

3
examples/protocols/pppos_client/main/pppos_client_main.c
View File

@@ -294,9 +294,10 @@ void app_main(void)
esp_mqtt_client_destroy(mqtt_client); esp_mqtt_client_destroy(mqtt_client);
/* Exit PPP mode */ /* Exit PPP mode */
ESP_ERROR_CHECK(esp_modem_stop_ppp(dte)); ESP_ERROR_CHECK(esp_modem_stop_ppp(dte));
/* Destroy the netif adapter withe events, which internally frees also the esp-netif instance */ /* Unregister events, destroy the netif adapter and destroy its esp-netif instance */
esp_modem_netif_clear_default_handlers(modem_netif_adapter); esp_modem_netif_clear_default_handlers(modem_netif_adapter);
esp_modem_netif_teardown(modem_netif_adapter); esp_modem_netif_teardown(modem_netif_adapter);
esp_netif_destroy(esp_netif);
xEventGroupWaitBits(event_group, STOP_BIT, pdTRUE, pdTRUE, portMAX_DELAY); xEventGroupWaitBits(event_group, STOP_BIT, pdTRUE, pdTRUE, portMAX_DELAY);
#if CONFIG_EXAMPLE_SEND_MSG #if CONFIG_EXAMPLE_SEND_MSG
const char *message = "Welcome to ESP32!"; const char *message = "Welcome to ESP32!";

4
tools/test_apps/protocols/pppos/main/pppos_client_main.c
View File

@@ -258,9 +258,11 @@ void app_main(void)
ESP_ERROR_CHECK(esp_modem_stop_ppp(dte)); ESP_ERROR_CHECK(esp_modem_stop_ppp(dte));
/* Wait for the PPP connection to terminate gracefully */ /* Wait for the PPP connection to terminate gracefully */
xEventGroupWaitBits(event_group, DISCONNECT_BIT, pdTRUE, pdTRUE, portMAX_DELAY); xEventGroupWaitBits(event_group, DISCONNECT_BIT, pdTRUE, pdTRUE, portMAX_DELAY);
/* Destroy the netif adapter withe events, which internally frees also the esp-netif instance */ /* Unregister events, destroy the netif adapter and destroy its esp-netif instance */
esp_modem_netif_clear_default_handlers(modem_netif_adapter); esp_modem_netif_clear_default_handlers(modem_netif_adapter);
esp_modem_netif_teardown(modem_netif_adapter); esp_modem_netif_teardown(modem_netif_adapter);
esp_netif_destroy(esp_netif);
xEventGroupWaitBits(event_group, STOP_BIT, pdTRUE, pdTRUE, portMAX_DELAY); xEventGroupWaitBits(event_group, STOP_BIT, pdTRUE, pdTRUE, portMAX_DELAY);
ESP_ERROR_CHECK(dce->deinit(dce)); ESP_ERROR_CHECK(dce->deinit(dce));
ESP_ERROR_CHECK(dte->deinit(dte)); ESP_ERROR_CHECK(dte->deinit(dte));