Fix merge issues

bulislaw · bulislaw · commit 1e7ba5fe798d · 2016-10-04T14:38:28.000+01:00
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 */

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ static err_t emac_lwip_low_level_output(struct netif netif, struct pbuf p)`
`35`	`35`
`36`	`36`	`static void emac_lwip_input(void data, emac_stack_t buf)`
`37`	`37`	`{`
`38`		`- struct eth_hdr *ethhdr;`
`39`	`38`	`struct pbuf p = (struct pbuf )buf;`
`40`	`39`	`struct netif netif = (struct netif )data;`
`41`	`40`
Original file line number	Diff line number	Diff line change
`@@ -513,6 +513,10 @@ int mbed_lwip_bringdown(void)`
`513`	`513`	`netif_set_down(&lwip_netif);`
`514`	`514`	`}`
`515`	`515`	`#endif`
	`516`	`+`
	`517`	`+ lwip_connected = false;`
	`518`	`+ // TO DO - actually remove addresses from stack, and shut down properly`
	`519`	`+ return 0;`
`516`	`520`	`}`
`517`	`521`
`518`	`522`	`/* LWIP error remapping */`