Merge pull request #4444 from Archcady/lwip_issue

theotherjimmy · web-flow · commit c08864b58860 · 2017-06-19T18:28:49.000-05:00
resolve lwip init twice issue
diff --git a/features/FEATURE_LWIP/lwip-interface/lwip_stack.c b/features/FEATURE_LWIP/lwip-interface/lwip_stack.c
@@ -476,8 +476,13 @@ nsapi_error_t mbed_lwip_emac_init(emac_interface_t *emac)
 // Backwards compatibility with people using DEVICE_EMAC
 nsapi_error_t mbed_lwip_init(emac_interface_t *emac)
 {
+    nsapi_error_t ret;
     mbed_lwip_core_init();
-    return mbed_lwip_emac_init(emac);
+    ret = mbed_lwip_emac_init(emac);
+    if (ret == NSAPI_ERROR_OK) {
+        netif_inited = true;
+    }
+    return ret;
 }
 
 // Backwards compatibility with people using DEVICE_EMAC

Original file line number	Diff line number	Diff line change
`@@ -476,8 +476,13 @@ nsapi_error_t mbed_lwip_emac_init(emac_interface_t *emac)`
`476`	`476`	`// Backwards compatibility with people using DEVICE_EMAC`
`477`	`477`	`nsapi_error_t mbed_lwip_init(emac_interface_t *emac)`
`478`	`478`	`{`
	`479`	`+ nsapi_error_t ret;`
`479`	`480`	`mbed_lwip_core_init();`
`480`		`- return mbed_lwip_emac_init(emac);`
	`481`	`+ ret = mbed_lwip_emac_init(emac);`
	`482`	`+ if (ret == NSAPI_ERROR_OK) {`
	`483`	`+ netif_inited = true;`
	`484`	`+ }`
	`485`	`+ return ret;`
`481`	`486`	`}`
`482`	`487`
`483`	`488`	`// Backwards compatibility with people using DEVICE_EMAC`