mirror of
https://github.com/ipxe/ipxe
synced 2025-12-12 14:32:49 +03:00
[netdevice] Add netdev argument to link-layer push and pull handlers
In order to construct outgoing link-layer frames or parse incoming ones properly, some protocols (such as 802.11) need more state than is available in the existing variables passed to the link-layer protocol handlers. To remedy this, add struct net_device *netdev as the first argument to each of these functions, so that more information can be fetched from the link layer-private part of the network device. Updated all three call sites (netdevice.c, efi_snp.c, pxe_undi.c) and both implementations (ethernet.c, ipoib.c) of ll_protocol to use the new argument. Signed-off-by: Michael Brown <mcb30@etherboot.org>
This commit is contained in:
committed by
Michael Brown
parent
743ebc2f4b
commit
eb3ca2a36f
@@ -509,7 +509,7 @@ int net_tx ( struct io_buffer *iobuf, struct net_device *netdev,
|
||||
netdev_poll ( netdev );
|
||||
|
||||
/* Add link-layer header */
|
||||
if ( ( rc = ll_protocol->push ( iobuf, ll_dest, netdev->ll_addr,
|
||||
if ( ( rc = ll_protocol->push ( netdev, iobuf, ll_dest, netdev->ll_addr,
|
||||
net_protocol->net_proto ) ) != 0 ) {
|
||||
free_iob ( iobuf );
|
||||
return rc;
|
||||
@@ -581,8 +581,8 @@ static void net_step ( struct process *process __unused ) {
|
||||
|
||||
/* Remove link-layer header */
|
||||
ll_protocol = netdev->ll_protocol;
|
||||
if ( ( rc = ll_protocol->pull ( iobuf, &ll_dest,
|
||||
&ll_source,
|
||||
if ( ( rc = ll_protocol->pull ( netdev, iobuf,
|
||||
&ll_dest, &ll_source,
|
||||
&net_proto ) ) != 0 ) {
|
||||
free_iob ( iobuf );
|
||||
continue;
|
||||
|
||||
Reference in New Issue
Block a user