narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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>
pull/1/head
Joshua Oreman 2009-06-15 11:37:43 -07:00 committed by Michael Brown
parent 743ebc2f4b
commit eb3ca2a36f
6 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/arch/i386/interface/pxe/pxe_undi.c
View File

@ -270,7 +270,7 @@ PXENV_EXIT_t pxenv_undi_transmit ( struct s_PXENV_UNDI_TRANSMIT
} }
/* Add link-layer header */ /* Add link-layer header */
if ( ( rc = ll_protocol->push ( iobuf, ll_dest, if ( ( rc = ll_protocol->push ( pxe_netdev, iobuf, ll_dest,
pxe_netdev->ll_addr, pxe_netdev->ll_addr,
net_protocol->net_proto ))!=0){ net_protocol->net_proto ))!=0){
free_iob ( iobuf ); free_iob ( iobuf );
@ -630,8 +630,8 @@ PXENV_EXIT_t pxenv_undi_isr ( struct s_PXENV_UNDI_ISR *undi_isr ) {
/* Strip link-layer header */ /* Strip link-layer header */
ll_protocol = pxe_netdev->ll_protocol; ll_protocol = pxe_netdev->ll_protocol;
if ( ( rc = ll_protocol->pull ( iobuf, &ll_dest, &ll_source, if ( ( rc = ll_protocol->pull ( pxe_netdev, iobuf, &ll_dest,
&net_proto ) ) != 0 ) { &ll_source, &net_proto )) !=0){
/* Assume unknown net_proto and no ll_source */ /* Assume unknown net_proto and no ll_source */
net_proto = 0; net_proto = 0;
ll_source = NULL; ll_source = NULL;

8
src/drivers/net/ipoib.c
View File

@ -238,13 +238,15 @@ ipoib_cache_peer ( const struct ib_gid *gid, unsigned long qpn ) {
/** /**
* Add IPoIB link-layer header * Add IPoIB link-layer header
* *
* @v netdev Network device
* @v iobuf I/O buffer * @v iobuf I/O buffer
* @v ll_dest Link-layer destination address * @v ll_dest Link-layer destination address
* @v ll_source Source link-layer address * @v ll_source Source link-layer address
* @v net_proto Network-layer protocol, in network-byte order * @v net_proto Network-layer protocol, in network-byte order
* @ret rc Return status code * @ret rc Return status code
*/ */
static int ipoib_push ( struct io_buffer *iobuf, const void *ll_dest, static int ipoib_push ( struct net_device *netdev __unused,
struct io_buffer *iobuf, const void *ll_dest,
const void *ll_source __unused, uint16_t net_proto ) { const void *ll_source __unused, uint16_t net_proto ) {
struct ipoib_hdr *ipoib_hdr = struct ipoib_hdr *ipoib_hdr =
iob_push ( iobuf, sizeof ( *ipoib_hdr ) ); iob_push ( iobuf, sizeof ( *ipoib_hdr ) );
@ -268,13 +270,15 @@ static int ipoib_push ( struct io_buffer *iobuf, const void *ll_dest,
/** /**
* Remove IPoIB link-layer header * Remove IPoIB link-layer header
* *
* @v netdev Network device
* @v iobuf I/O buffer * @v iobuf I/O buffer
* @ret ll_dest Link-layer destination address * @ret ll_dest Link-layer destination address
* @ret ll_source Source link-layer address * @ret ll_source Source link-layer address
* @ret net_proto Network-layer protocol, in network-byte order * @ret net_proto Network-layer protocol, in network-byte order
* @ret rc Return status code * @ret rc Return status code
*/ */
static int ipoib_pull ( struct io_buffer *iobuf, const void **ll_dest, static int ipoib_pull ( struct net_device *netdev __unused,
struct io_buffer *iobuf, const void **ll_dest,
const void **ll_source, uint16_t *net_proto ) { const void **ll_source, uint16_t *net_proto ) {
struct ipoib_hdr *ipoib_hdr = iobuf->data; struct ipoib_hdr *ipoib_hdr = iobuf->data;
struct ipoib_peer *dest; struct ipoib_peer *dest;

12
src/include/gpxe/netdevice.h
View File

@ -88,25 +88,29 @@ struct ll_protocol {
/** /**
* Add link-layer header * Add link-layer header
* *
* @v netdev Network device
* @v iobuf I/O buffer * @v iobuf I/O buffer
* @v ll_dest Link-layer destination address * @v ll_dest Link-layer destination address
* @v ll_source Source link-layer address * @v ll_source Source link-layer address
* @v net_proto Network-layer protocol, in network-byte order * @v net_proto Network-layer protocol, in network-byte order
* @ret rc Return status code * @ret rc Return status code
*/ */
int ( * push ) ( struct io_buffer *iobuf, const void *ll_dest, int ( * push ) ( struct net_device *netdev, struct io_buffer *iobuf,
const void *ll_source, uint16_t net_proto ); const void *ll_dest, const void *ll_source,
uint16_t net_proto );
/** /**
* Remove link-layer header * Remove link-layer header
* *
* @v netdev Network device
* @v iobuf I/O buffer * @v iobuf I/O buffer
* @ret ll_dest Link-layer destination address * @ret ll_dest Link-layer destination address
* @ret ll_source Source link-layer address * @ret ll_source Source link-layer address
* @ret net_proto Network-layer protocol, in network-byte order * @ret net_proto Network-layer protocol, in network-byte order
* @ret rc Return status code * @ret rc Return status code
*/ */
int ( * pull ) ( struct io_buffer *iobuf, const void **ll_dest, int ( * pull ) ( struct net_device *netdev, struct io_buffer *iobuf,
const void **ll_source, uint16_t *net_proto ); const void **ll_dest, const void **ll_source,
uint16_t *net_proto );
/** /**
* Transcribe link-layer address * Transcribe link-layer address
* *

7
src/interface/efi/efi_snp.c
View File

@ -594,7 +594,8 @@ efi_snp_transmit ( EFI_SIMPLE_NETWORK_PROTOCOL *snp,
/* Create link-layer header, if specified */ /* Create link-layer header, if specified */
if ( ll_header_len ) { if ( ll_header_len ) {
iob_pull ( iobuf, 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 ){ htons ( *net_proto ) )) != 0 ){
DBGC ( snpdev, "SNPDEV %p TX could not construct " DBGC ( snpdev, "SNPDEV %p TX could not construct "
"header: %s\n", snpdev, strerror ( rc ) ); "header: %s\n", snpdev, strerror ( rc ) );
@ -672,8 +673,8 @@ efi_snp_receive ( EFI_SIMPLE_NETWORK_PROTOCOL *snp,
*len = iob_len ( iobuf ); *len = iob_len ( iobuf );
/* Attempt to decode link-layer header */ /* Attempt to decode link-layer header */
if ( ( rc = ll_protocol->pull ( iobuf, &iob_ll_dest, &iob_ll_src, if ( ( rc = ll_protocol->pull ( snpdev->netdev, iobuf, &iob_ll_dest,
&iob_net_proto ) ) != 0 ) { &iob_ll_src, &iob_net_proto ) ) != 0 ){
DBGC ( snpdev, "SNPDEV %p could not parse header: %s\n", DBGC ( snpdev, "SNPDEV %p could not parse header: %s\n",
snpdev, strerror ( rc ) ); snpdev, strerror ( rc ) );
efirc = RC_TO_EFIRC ( rc ); efirc = RC_TO_EFIRC ( rc );

8
src/net/ethernet.c
View File

@ -43,13 +43,15 @@ static uint8_t eth_broadcast[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
/** /**
* Add Ethernet link-layer header * Add Ethernet link-layer header
* *
* @v netdev Network device
* @v iobuf I/O buffer * @v iobuf I/O buffer
* @v ll_dest Link-layer destination address * @v ll_dest Link-layer destination address
* @v ll_source Source link-layer address * @v ll_source Source link-layer address
* @v net_proto Network-layer protocol, in network-byte order * @v net_proto Network-layer protocol, in network-byte order
* @ret rc Return status code * @ret rc Return status code
*/ */
static int eth_push ( struct io_buffer *iobuf, const void *ll_dest, static int eth_push ( struct net_device *netdev __unused,
struct io_buffer *iobuf, const void *ll_dest,
const void *ll_source, uint16_t net_proto ) { const void *ll_source, uint16_t net_proto ) {
struct ethhdr *ethhdr = iob_push ( iobuf, sizeof ( *ethhdr ) ); struct ethhdr *ethhdr = iob_push ( iobuf, sizeof ( *ethhdr ) );
@ -64,13 +66,15 @@ static int eth_push ( struct io_buffer *iobuf, const void *ll_dest,
/** /**
* Remove Ethernet link-layer header * Remove Ethernet link-layer header
* *
* @v netdev Network device
* @v iobuf I/O buffer * @v iobuf I/O buffer
* @ret ll_dest Link-layer destination address * @ret ll_dest Link-layer destination address
* @ret ll_source Source link-layer address * @ret ll_source Source link-layer address
* @ret net_proto Network-layer protocol, in network-byte order * @ret net_proto Network-layer protocol, in network-byte order
* @ret rc Return status code * @ret rc Return status code
*/ */
static int eth_pull ( struct io_buffer *iobuf, const void **ll_dest, static int eth_pull ( struct net_device *netdev __unused,
struct io_buffer *iobuf, const void **ll_dest,
const void **ll_source, uint16_t *net_proto ) { const void **ll_source, uint16_t *net_proto ) {
struct ethhdr *ethhdr = iobuf->data; struct ethhdr *ethhdr = iobuf->data;

6
src/net/netdevice.c
View File

@ -509,7 +509,7 @@ int net_tx ( struct io_buffer *iobuf, struct net_device *netdev,
netdev_poll ( netdev ); netdev_poll ( netdev );
/* Add link-layer header */ /* 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 ) { net_protocol->net_proto ) ) != 0 ) {
free_iob ( iobuf ); free_iob ( iobuf );
return rc; return rc;
@ -581,8 +581,8 @@ static void net_step ( struct process *process __unused ) {
/* Remove link-layer header */ /* Remove link-layer header */
ll_protocol = netdev->ll_protocol; ll_protocol = netdev->ll_protocol;
if ( ( rc = ll_protocol->pull ( iobuf, &ll_dest, if ( ( rc = ll_protocol->pull ( netdev, iobuf,
&ll_source, &ll_dest, &ll_source,
&net_proto ) ) != 0 ) { &net_proto ) ) != 0 ) {
free_iob ( iobuf ); free_iob ( iobuf );
continue; continue;