diff options
| author | Michael Brown | 2006-08-09 03:24:32 +0200 |
|---|---|---|
| committer | Michael Brown | 2006-08-09 03:24:32 +0200 |
| commit | a3d508b648906fb742e5205bcd4b97fbf88ea653 (patch) | |
| tree | f5783a075a4d73d014949412a2323637bace4a09 /src/include/gpxe/netdevice.h | |
| parent | Note to self: learn to count. (diff) | |
| download | ipxe-a3d508b648906fb742e5205bcd4b97fbf88ea653.tar.gz ipxe-a3d508b648906fb742e5205bcd4b97fbf88ea653.tar.xz ipxe-a3d508b648906fb742e5205bcd4b97fbf88ea653.zip | |
Clarified packet ownership transfer between a few functions.
Added a large number of missing calls to free_pkb(). In the case of UDP,
no received packets were ever freed, which lead to memory exhaustion
remarkably quickly once pxelinux started up.
In general, any function with _rx() in its name which accepts a pk_buff
*must* either call free_pkb() or pass the pkb to another _rx() function
(e.g. the next layer up the stack). Since the UDP (and TCP) layers don't
pass packet buffers up to the higher-layer protocols (the
"applications"), they must free the packet buffer after calling the
application's newdata() method.
Diffstat (limited to 'src/include/gpxe/netdevice.h')
| -rw-r--r-- | src/include/gpxe/netdevice.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/include/gpxe/netdevice.h b/src/include/gpxe/netdevice.h index b8cf9aee..60ce886d 100644 --- a/src/include/gpxe/netdevice.h +++ b/src/include/gpxe/netdevice.h @@ -83,6 +83,7 @@ struct ll_protocol { * * This method should prepend in the link-layer header * (e.g. the Ethernet DIX header) and transmit the packet. + * This method takes ownership of the packet buffer. */ int ( * tx ) ( struct pk_buff *pkb, struct net_device *netdev, struct net_protocol *net_protocol, @@ -95,9 +96,10 @@ struct ll_protocol { * * This method should strip off the link-layer header * (e.g. the Ethernet DIX header) and pass the packet to - * net_rx(). + * net_rx(). This method takes ownership of the packet + * buffer. */ - void ( * rx ) ( struct pk_buff *pkb, struct net_device *netdev ); + int ( * rx ) ( struct pk_buff *pkb, struct net_device *netdev ); /** * Transcribe link-layer address * @@ -206,8 +208,8 @@ extern int netdev_tx ( struct net_device *netdev, struct pk_buff *pkb ); extern void netdev_rx ( struct net_device *netdev, struct pk_buff *pkb ); extern int net_tx ( struct pk_buff *pkb, struct net_device *netdev, struct net_protocol *net_protocol, const void *ll_dest ); -extern void net_rx ( struct pk_buff *pkb, struct net_device *netdev, - uint16_t net_proto, const void *ll_source ); +extern int net_rx ( struct pk_buff *pkb, struct net_device *netdev, + uint16_t net_proto, const void *ll_source ); extern int netdev_poll ( struct net_device *netdev ); extern struct pk_buff * netdev_rx_dequeue ( struct net_device *netdev ); extern struct net_device * alloc_netdev ( size_t priv_size ); |