sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-12 14:32:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

[netdevice] Change link-layer push() and pull() methods to take raw types

Browse Source 
EFI requires us to be able to specify the source address for
individual transmitted packets, and to be able to extract the
destination address on received packets.

Take advantage of this to rationalise the push() and pull() methods so
that push() takes a (dest,source,proto) tuple and pull() returns a
(dest,source,proto) tuple.
This commit is contained in:
Michael Brown
2008-10-15 04:17:48 +01:00
parent 6b9cc25556
commit 3a505dfc35
5 changed files with 56 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/net/netdevice.c
View File

@@ -439,6 +439,7 @@ struct net_device * find_netdev_by_location ( unsigned int bus_type,
*/
int net_tx ( struct io_buffer *iobuf, struct net_device *netdev,
struct net_protocol *net_protocol, const void *ll_dest ) {
struct ll_protocol *ll_protocol = netdev->ll_protocol;
int rc;
/* Force a poll on the netdevice to (potentially) clear any
@@ -449,8 +450,8 @@ int net_tx ( struct io_buffer *iobuf, struct net_device *netdev,
netdev_poll ( netdev );
/* Add link-layer header */
if ( ( rc = netdev->ll_protocol->push ( iobuf, netdev, net_protocol,
ll_dest ) ) != 0 ) {
if ( ( rc = ll_protocol->push ( iobuf, ll_dest, netdev->ll_addr,
net_protocol->net_proto ) ) != 0 ) {
free_iob ( iobuf );
return rc;
}
@@ -495,8 +496,9 @@ static void net_step ( struct process *process __unused ) {
struct net_device *netdev;
struct io_buffer *iobuf;
struct ll_protocol *ll_protocol;
uint16_t net_proto;
const void *ll_dest;
const void *ll_source;
uint16_t net_proto;
int rc;
/* Poll and process each network device */
@@ -519,9 +521,9 @@ static void net_step ( struct process *process __unused ) {
/* Remove link-layer header */
ll_protocol = netdev->ll_protocol;
if ( ( rc = ll_protocol->pull ( iobuf, netdev,
&net_proto,
&ll_source ) ) != 0 ) {
if ( ( rc = ll_protocol->pull ( iobuf, &ll_dest,
&ll_source,
&net_proto ) ) != 0 ) {
free_iob ( iobuf );
continue;
}