mirror of
https://github.com/ipxe/ipxe
synced 2025-12-21 12:30:20 +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
@@ -594,7 +594,8 @@ efi_snp_transmit ( EFI_SIMPLE_NETWORK_PROTOCOL *snp,
|
||||
/* Create link-layer header, if specified */
|
||||
if ( ll_header_len ) {
|
||||
iob_pull ( iobuf, ll_header_len );
|
||||
if ( ( rc = ll_protocol->push ( iobuf, ll_dest, ll_src,
|
||||
if ( ( rc = ll_protocol->push ( snpdev->netdev,
|
||||
iobuf, ll_dest, ll_src,
|
||||
htons ( *net_proto ) )) != 0 ){
|
||||
DBGC ( snpdev, "SNPDEV %p TX could not construct "
|
||||
"header: %s\n", snpdev, strerror ( rc ) );
|
||||
@@ -672,8 +673,8 @@ efi_snp_receive ( EFI_SIMPLE_NETWORK_PROTOCOL *snp,
|
||||
*len = iob_len ( iobuf );
|
||||
|
||||
/* Attempt to decode link-layer header */
|
||||
if ( ( rc = ll_protocol->pull ( iobuf, &iob_ll_dest, &iob_ll_src,
|
||||
&iob_net_proto ) ) != 0 ) {
|
||||
if ( ( rc = ll_protocol->pull ( snpdev->netdev, iobuf, &iob_ll_dest,
|
||||
&iob_ll_src, &iob_net_proto ) ) != 0 ){
|
||||
DBGC ( snpdev, "SNPDEV %p could not parse header: %s\n",
|
||||
snpdev, strerror ( rc ) );
|
||||
efirc = RC_TO_EFIRC ( rc );
|
||||
|
||||
Reference in New Issue
Block a user