david/ipxe
david/ipxe
Archived
1
0
Fork 0
Code

[udp] Use MAX_LL_NET_HEADER_LEN instead of defining our own UDP_MAX_HLEN

Browse Source 
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2010-11-19 15:45:41 +00:00
parent 0d7839678b
commit 5de4fba4f9
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/ipxe/udp.h
View File

@ -23,7 +23,6 @@ struct sockaddr;
* UDP constants * UDP constants
*/ */
#define UDP_MAX_HLEN 72
#define UDP_MAX_TXIOB ETH_MAX_MTU #define UDP_MAX_TXIOB ETH_MAX_MTU
#define UDP_MIN_TXIOB ETH_ZLEN #define UDP_MIN_TXIOB ETH_ZLEN

8
src/net/udp.c
View File

@ -9,6 +9,7 @@
#include <ipxe/xfer.h> #include <ipxe/xfer.h>
#include <ipxe/open.h> #include <ipxe/open.h>
#include <ipxe/uri.h> #include <ipxe/uri.h>
#include <ipxe/netdevice.h>
#include <ipxe/udp.h> #include <ipxe/udp.h>
/** @file /** @file
@ -197,7 +198,8 @@ static int udp_tx ( struct udp_connection *udp, struct io_buffer *iobuf,
int rc; int rc;
/* Check we can accommodate the header */ /* 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 ); free_iob ( iobuf );
return rc; return rc;
} }
@ -361,13 +363,13 @@ static struct io_buffer * udp_xfer_alloc_iob ( struct udp_connection *udp,
size_t len ) { size_t len ) {
struct io_buffer *iobuf; struct io_buffer *iobuf;
iobuf = alloc_iob ( UDP_MAX_HLEN + len ); iobuf = alloc_iob ( MAX_LL_NET_HEADER_LEN + len );
if ( ! iobuf ) { if ( ! iobuf ) {
DBGC ( udp, "UDP %p cannot allocate buffer of length %zd\n", DBGC ( udp, "UDP %p cannot allocate buffer of length %zd\n",
udp, len ); udp, len );
return NULL; return NULL;
} }
iob_reserve ( iobuf, UDP_MAX_HLEN ); iob_reserve ( iobuf, MAX_LL_NET_HEADER_LEN );
return iobuf; return iobuf;
} }