From 8a143fcf40709813c6e0b1cd54dbb9e0abac5ffe Mon Sep 17 00:00:00 2001 From: David Cermak Date: Thu, 22 Oct 2020 17:48:34 +0200 Subject: [PATCH 1/2] esp-netif: Fix PPP netif event posting to include esp_netif data Closes https://github.com/espressif/esp-idf/issues/6009 --- components/esp_netif/lwip/esp_netif_lwip_ppp.c | 4 ++-- examples/protocols/pppos_client/main/pppos_client_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/esp_netif/lwip/esp_netif_lwip_ppp.c b/components/esp_netif/lwip/esp_netif_lwip_ppp.c index f11260a158..6513862481 100644 --- a/components/esp_netif/lwip/esp_netif_lwip_ppp.c +++ b/components/esp_netif/lwip/esp_netif_lwip_ppp.c @@ -168,7 +168,7 @@ static void on_ppp_status_changed(ppp_pcb *pcb, int err_code, void *ctx) break; } if (obj->ppp_error_event_enabled) { - err = esp_event_post(NETIF_PPP_STATUS, err_code, netif, sizeof(netif), 0); + err = esp_event_post(NETIF_PPP_STATUS, err_code, &netif, sizeof(netif), 0); if (err != ESP_OK) { ESP_LOGE(TAG, "esp_event_post failed with code %d", err); } @@ -219,7 +219,7 @@ static void on_ppp_notify_phase(ppp_pcb *pcb, u8_t phase, void *ctx) lwip_peer2peer_ctx_t *obj = (lwip_peer2peer_ctx_t *)netif->related_data; assert(obj->base.netif_type == PPP_LWIP_NETIF); if (obj && obj->ppp_phase_event_enabled) { - esp_err_t err = esp_event_post(NETIF_PPP_STATUS, NETIF_PP_PHASE_OFFSET + phase, netif, sizeof(netif), 0); + esp_err_t err = esp_event_post(NETIF_PPP_STATUS, NETIF_PP_PHASE_OFFSET + phase, &netif, sizeof(netif), 0); if (err != ESP_OK) { ESP_LOGE(TAG, "esp_event_post failed with code %d", err); } diff --git a/examples/protocols/pppos_client/main/pppos_client_main.c b/examples/protocols/pppos_client/main/pppos_client_main.c index aa0066c26a..67a64c3fb0 100644 --- a/examples/protocols/pppos_client/main/pppos_client_main.c +++ b/examples/protocols/pppos_client/main/pppos_client_main.c @@ -173,7 +173,7 @@ static void on_ppp_changed(void *arg, esp_event_base_t event_base, ESP_LOGI(TAG, "PPP state changed event %d", event_id); if (event_id == NETIF_PPP_ERRORUSER) { /* User interrupted event from esp-netif */ - esp_netif_t *netif = event_data; + esp_netif_t *netif = *(esp_netif_t**)event_data; ESP_LOGI(TAG, "User interrupted event from netif:%p", netif); } } From 8d6e03a52961376ec024bdeef89e0270cc1977ff Mon Sep 17 00:00:00 2001 From: David Cermak Date: Mon, 26 Oct 2020 16:55:16 +0100 Subject: [PATCH 2/2] ci: increase parallel job count for S2 unit tests --- tools/ci/config/target-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml index efa6417ef4..9c5dca4b82 100644 --- a/tools/ci/config/target-test.yml +++ b/tools/ci/config/target-test.yml @@ -596,7 +596,7 @@ UT_034: UT_035: extends: .unit_test_s2_template - parallel: 42 + parallel: 43 tags: - ESP32S2_IDF - UT_T1_1