Fix merge issues

dinau · Oct 4, 2016 · 1e7ba5f · 1e7ba5f
1 parent ae11b51
commit 1e7ba5f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/features/FEATURE_LWIP/lwip-interface/emac_lwip.c b/features/FEATURE_LWIP/lwip-interface/emac_lwip.c
@@ -35,7 +35,6 @@ static err_t emac_lwip_low_level_output(struct netif *netif, struct pbuf *p)
 
 static void emac_lwip_input(void *data, emac_stack_t *buf)
 {
-    struct eth_hdr *ethhdr;
     struct pbuf *p = (struct pbuf *)buf;
     struct netif *netif = (struct netif *)data;
 

diff --git a/features/FEATURE_LWIP/lwip-interface/lwip_stack.c b/features/FEATURE_LWIP/lwip-interface/lwip_stack.c
@@ -513,6 +513,10 @@ int mbed_lwip_bringdown(void)
         netif_set_down(&lwip_netif);
     }
 #endif
+
+    lwip_connected = false;
+    // TO DO - actually remove addresses from stack, and shut down properly
+    return 0;
 }
 
 /* LWIP error remapping */