Merge branch 'bugfix/pppos_ignored_modem_start_return' into 'master'

david-cermak · david-cermak · commit 93aa9163c7f3 · 2020-06-19T20:48:49.000+08:00
pppos client: modem netif fix ignoring potential modem-start error

Closes IDFGH-3470

See merge request espressif/esp-idf!9244
diff --git a/examples/protocols/pppos_client/components/modem/src/esp_modem_netif.c b/examples/protocols/pppos_client/components/modem/src/esp_modem_netif.c
@@ -53,7 +53,7 @@ static esp_err_t esp_modem_dte_transmit(void *h, void *buffer, size_t len)
  * @param esp_netif handle to esp-netif object
  * @param args pointer to modem-netif driver
  *
- * @return ESP_OK on success
+ * @return ESP_OK on success, modem-start error code if starting failed
  */
 static esp_err_t esp_modem_post_attach_start(esp_netif_t * esp_netif, void * args)
 {
@@ -66,8 +66,7 @@ static esp_err_t esp_modem_post_attach_start(esp_netif_t * esp_netif, void * arg
     };
     driver->base.netif = esp_netif;
     ESP_ERROR_CHECK(esp_netif_set_driver_config(esp_netif, &driver_ifconfig));
-    esp_modem_start_ppp(dte);
-    return ESP_OK;
+    return esp_modem_start_ppp(dte);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ static esp_err_t esp_modem_dte_transmit(void h, void buffer, size_t len)`
`53`	`53`	`* @param esp_netif handle to esp-netif object`
`54`	`54`	`* @param args pointer to modem-netif driver`
`55`	`55`	`*`
`56`		`- * @return ESP_OK on success`
	`56`	`+ * @return ESP_OK on success, modem-start error code if starting failed`
`57`	`57`	`*/`
`58`	`58`	`static esp_err_t esp_modem_post_attach_start(esp_netif_t * esp_netif, void * args)`
`59`	`59`	`{`
`@@ -66,8 +66,7 @@ static esp_err_t esp_modem_post_attach_start(esp_netif_t * esp_netif, void * arg`
`66`	`66`	`};`
`67`	`67`	`driver->base.netif = esp_netif;`
`68`	`68`	`ESP_ERROR_CHECK(esp_netif_set_driver_config(esp_netif, &driver_ifconfig));`
`69`		`- esp_modem_start_ppp(dte);`
`70`		`- return ESP_OK;`
	`69`	`+ return esp_modem_start_ppp(dte);`
`71`	`70`	`}`
`72`	`71`
`73`	`72`	`/**`