diff options
| author | Michael Brown | 2008-03-10 14:02:53 +0100 |
|---|---|---|
| committer | Michael Brown | 2008-03-10 14:02:53 +0100 |
| commit | 3e781eb87f7b5bfa638f94234bb5e9d64508b0a4 (patch) | |
| tree | 5884ac0438320638c846166856a4b54b3564bd23 /src/net | |
| parent | [PXE] Work around a buffer-size bug in WinPE (diff) | |
| parent | Use plain C in timer_rdtsc for division instead of inline asssembly. (diff) | |
| download | ipxe-3e781eb87f7b5bfa638f94234bb5e9d64508b0a4.tar.gz ipxe-3e781eb87f7b5bfa638f94234bb5e9d64508b0a4.tar.xz ipxe-3e781eb87f7b5bfa638f94234bb5e9d64508b0a4.zip | |
Merge branch 'xl0-timer'
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/retry.c | 2 | ||||
| -rw-r--r-- | src/net/tcp.c | 2 | ||||
| -rw-r--r-- | src/net/udp/dhcp.c | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/net/retry.c b/src/net/retry.c index 0f711e6d1..90b897112 100644 --- a/src/net/retry.c +++ b/src/net/retry.c @@ -17,7 +17,7 @@ */ #include <stddef.h> -#include <latch.h> +#include <gpxe/timer.h> #include <gpxe/list.h> #include <gpxe/process.h> #include <gpxe/init.h> diff --git a/src/net/tcp.c b/src/net/tcp.c index d6b44b02b..da8e87b4b 100644 --- a/src/net/tcp.c +++ b/src/net/tcp.c @@ -4,7 +4,7 @@ #include <assert.h> #include <errno.h> #include <byteswap.h> -#include <timer.h> +#include <gpxe/timer.h> #include <gpxe/iobuf.h> #include <gpxe/malloc.h> #include <gpxe/retry.h> diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c index 081fa841a..2cb258e43 100644 --- a/src/net/udp/dhcp.c +++ b/src/net/udp/dhcp.c @@ -33,6 +33,7 @@ #include <gpxe/ip.h> #include <gpxe/uuid.h> #include <gpxe/dhcp.h> +#include <gpxe/timer.h> /** @file * |