Merge branch 'master' into ppp-new

2014-01-17 00:48:55 +01:00
parent 357b28f675 8b63a89267
commit 87cfd930e4
8 changed files with 58 additions and 13 deletions
--- a/src/api/tcpip.c
+++ b/src/api/tcpip.c
@@ -46,6 +46,7 @@
 #include "lwip/pbuf.h"
 #include "lwip/tcpip.h"
 #include "lwip/init.h"
+#include "lwip/ip.h"
 #include "netif/etharp.h"
 #include "netif/ppp/pppoe.h"