From 5c54a6a0e958dedd07e5a95d28469f0b19d72de9 Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Tue, 21 Jun 2016 14:47:12 +0000
Subject: [PATCH] Upgrade lwip to 2.0.0 to fix the keepalive bug #456.

---
 artiq/runtime/liblwip/Makefile | 4 +++-
 artiq/runtime/lwip             | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/artiq/runtime/liblwip/Makefile b/artiq/runtime/liblwip/Makefile
index ae3facbba..f687a77c6 100644
--- a/artiq/runtime/liblwip/Makefile
+++ b/artiq/runtime/liblwip/Makefile
@@ -15,6 +15,7 @@ COREFILES=core/mem.c \
 	core/raw.c \
 	core/stats.c \
 	core/sys.c \
+	core/ip.c \
 	core/tcp.c \
 	core/tcp_in.c \
 	core/tcp_out.c \
@@ -29,7 +30,8 @@ CORE4FILES=core/ipv4/icmp.c \
 	core/ipv4/ip_frag.c
 
 # NETIFFILES: Files implementing various generic network interface functions.
-NETIFFILES=netif/etharp.c
+NETIFFILES=netif/etharp.c \
+	netif/ethernet.c
 
 PPPFILES=netif/ppp/auth.c \
 	netif/ppp/fsm.c \
diff --git a/artiq/runtime/lwip b/artiq/runtime/lwip
index e448a9a4a..33955c636 160000
--- a/artiq/runtime/lwip
+++ b/artiq/runtime/lwip
@@ -1 +1 @@
-Subproject commit e448a9a4a976a6bc3091e3f22309ae3e6c089351
+Subproject commit 33955c636d17bee230cde746a92e1cff11a7a177