diff options
| author | Michael Brown <mcb30@ipxe.org> | 2010-11-19 15:45:41 +0000 |
|---|---|---|
| committer | Michael Brown <mcb30@ipxe.org> | 2010-11-19 16:08:05 +0000 |
| commit | 5de4fba4f99e3dbb6da1d1d71aaf2a9d3f8b899f (patch) | |
| tree | 4c35b5e17fa714620b518c6357335b285d03faed | |
| parent | 0d7839678b9353e8b8c37f2c3311fbf52df9e149 (diff) | |
| download | ipxe-5de4fba4f99e3dbb6da1d1d71aaf2a9d3f8b899f.tar.gz | |
[udp] Use MAX_LL_NET_HEADER_LEN instead of defining our own UDP_MAX_HLEN
Signed-off-by: Michael Brown <mcb30@ipxe.org>
| -rw-r--r-- | src/include/ipxe/udp.h | 1 | ||||
| -rw-r--r-- | src/net/udp.c | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/include/ipxe/udp.h b/src/include/ipxe/udp.h index c18a29723..ed0494763 100644 --- a/src/include/ipxe/udp.h +++ b/src/include/ipxe/udp.h @@ -23,7 +23,6 @@ struct sockaddr; * UDP constants */ -#define UDP_MAX_HLEN 72 #define UDP_MAX_TXIOB ETH_MAX_MTU #define UDP_MIN_TXIOB ETH_ZLEN diff --git a/src/net/udp.c b/src/net/udp.c index 9bd80f3a3..5f452535c 100644 --- a/src/net/udp.c +++ b/src/net/udp.c @@ -9,6 +9,7 @@ #include <ipxe/xfer.h> #include <ipxe/open.h> #include <ipxe/uri.h> +#include <ipxe/netdevice.h> #include <ipxe/udp.h> /** @file @@ -197,7 +198,8 @@ static int udp_tx ( struct udp_connection *udp, struct io_buffer *iobuf, int rc; /* Check we can accommodate the header */ - if ( ( rc = iob_ensure_headroom ( iobuf, UDP_MAX_HLEN ) ) != 0 ) { + if ( ( rc = iob_ensure_headroom ( iobuf, + MAX_LL_NET_HEADER_LEN ) ) != 0 ) { free_iob ( iobuf ); return rc; } @@ -361,13 +363,13 @@ static struct io_buffer * udp_xfer_alloc_iob ( struct udp_connection *udp, size_t len ) { struct io_buffer *iobuf; - iobuf = alloc_iob ( UDP_MAX_HLEN + len ); + iobuf = alloc_iob ( MAX_LL_NET_HEADER_LEN + len ); if ( ! iobuf ) { DBGC ( udp, "UDP %p cannot allocate buffer of length %zd\n", udp, len ); return NULL; } - iob_reserve ( iobuf, UDP_MAX_HLEN ); + iob_reserve ( iobuf, MAX_LL_NET_HEADER_LEN ); return iobuf; } |