xCAT/xNBA
2
0
Fork 0
mirror of https://github.com/xcat2/xNBA.git synced 2024-11-23 01:51:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix a couple of broken assertions, and align the buffer correctly.

Browse Source
This commit is contained in:
Michael Brown 2006-04-28 14:09:31 +00:00
parent 79f64eea55
commit 1488cd3b73
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/gpxe/pkbuff.h
View File

@ -33,7 +33,7 @@ struct ll_protocol;
* This structure is used to represent a network packet within gPXE.
*/
struct pk_buff {
/** Head of the buffer */
/** Start of the buffer */
void *head;
/** Start of data */
void *data;
@ -87,7 +87,7 @@ static inline void * pkb_push ( struct pk_buff *pkb, size_t len ) {
*/
static inline void * pkb_pull ( struct pk_buff *pkb, size_t len ) {
pkb->data += len;
assert ( pkb->data >= pkb->tail );
assert ( pkb->data <= pkb->tail );
return pkb->data;
}

5
src/net/pkbuff.c
View File

@ -40,7 +40,7 @@ struct pk_buff * alloc_pkb ( size_t len ) {
void *data;
/* Align buffer length */
len = ( len + __alignof__ ( *pkb ) - 1 ) & ~ __alignof__ ( *pkb );
len = ( len + __alignof__( *pkb ) - 1 ) & ~( __alignof__( *pkb ) - 1 );
/* Allocate memory for buffer plus descriptor */
data = malloc_dma ( len + sizeof ( *pkb ), PKBUFF_ALIGN );
@ -60,6 +60,9 @@ struct pk_buff * alloc_pkb ( size_t len ) {
*/
void free_pkb ( struct pk_buff *pkb ) {
if ( pkb ) {
assert ( pkb->head <= pkb->data );
assert ( pkb->data <= pkb->tail );
assert ( pkb->tail <= pkb->end );
free_dma ( pkb->head,
( pkb->end - pkb->head ) + sizeof ( *pkb ) );
}