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

pkbuff->iobuf changeover

Browse Source 
Achieved via Perl using:

perl -pi -e 's/pk_buff/io_buffer/g; s/Packet buffer/I\/O buffer/ig; ' \
	-e 's/pkbuff\.h/iobuf.h/g; s/pkb_/iob_/g; s/_pkb/_iob/g; ' \
	-e 's/pkb/iobuf/g; s/PKB/IOB/g;'
This commit is contained in:
Michael Brown
2007-05-19 18:39:40 +00:00
parent 7c0a069f42
commit 3e2c6b6736
25 changed files with 429 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/drivers/net/legacy.c
View File

@@ -4,7 +4,7 @@
#include <gpxe/if_ether.h>
#include <gpxe/netdevice.h>
#include <gpxe/ethernet.h>
#include <gpxe/pkbuff.h>
#include <gpxe/iobuf.h>
#include <nic.h>
/*
@@ -21,38 +21,38 @@ struct nic nic;
static int legacy_registered = 0;
static int legacy_transmit ( struct net_device *netdev, struct pk_buff *pkb ) {
static int legacy_transmit ( struct net_device *netdev, struct io_buffer *iobuf ) {
struct nic *nic = netdev->priv;
struct ethhdr *ethhdr = pkb->data;
struct ethhdr *ethhdr = iobuf->data;
DBG ( "Transmitting %d bytes\n", pkb_len ( pkb ) );
pkb_pad ( pkb, ETH_ZLEN );
pkb_pull ( pkb, sizeof ( *ethhdr ) );
DBG ( "Transmitting %d bytes\n", iob_len ( iobuf ) );
iob_pad ( iobuf, ETH_ZLEN );
iob_pull ( iobuf, sizeof ( *ethhdr ) );
nic->nic_op->transmit ( nic, ( const char * ) ethhdr->h_dest,
ntohs ( ethhdr->h_protocol ),
pkb_len ( pkb ), pkb->data );
netdev_tx_complete ( netdev, pkb );
iob_len ( iobuf ), iobuf->data );
netdev_tx_complete ( netdev, iobuf );
return 0;
}
static void legacy_poll ( struct net_device *netdev, unsigned int rx_quota ) {
struct nic *nic = netdev->priv;
struct pk_buff *pkb;
struct io_buffer *iobuf;
if ( ! rx_quota )
return;
pkb = alloc_pkb ( ETH_FRAME_LEN );
if ( ! pkb )
iobuf = alloc_iob ( ETH_FRAME_LEN );
if ( ! iobuf )
return;
nic->packet = pkb->data;
nic->packet = iobuf->data;
if ( nic->nic_op->poll ( nic, 1 ) ) {
DBG ( "Received %d bytes\n", nic->packetlen );
pkb_put ( pkb, nic->packetlen );
netdev_rx ( netdev, pkb );
iob_put ( iobuf, nic->packetlen );
netdev_rx ( netdev, iobuf );
} else {
free_pkb ( pkb );
free_iob ( iobuf );
}
}

24
src/drivers/net/pnic.c
View File

@@ -19,7 +19,7 @@ Bochs Pseudo NIC driver for Etherboot
#include <gpxe/pci.h>
#include <gpxe/if_ether.h>
#include <gpxe/ethernet.h>
#include <gpxe/pkbuff.h>
#include <gpxe/iobuf.h>
#include <gpxe/netdevice.h>
#include "pnic_api.h"
@@ -114,7 +114,7 @@ POLL - Wait for a frame
***************************************************************************/
static void pnic_poll ( struct net_device *netdev, unsigned int rx_quota ) {
struct pnic *pnic = netdev->priv;
struct pk_buff *pkb;
struct io_buffer *iobuf;
uint16_t length;
uint16_t qlen;
@@ -126,19 +126,19 @@ static void pnic_poll ( struct net_device *netdev, unsigned int rx_quota ) {
break;
if ( qlen == 0 )
break;
pkb = alloc_pkb ( ETH_FRAME_LEN );
if ( ! pkb ) {
iobuf = alloc_iob ( ETH_FRAME_LEN );
if ( ! iobuf ) {
printf ( "could not allocate buffer\n" );
break;
}
if ( pnic_command ( pnic, PNIC_CMD_RECV, NULL, 0,
pkb->data, ETH_FRAME_LEN, &length )
iobuf->data, ETH_FRAME_LEN, &length )
!= PNIC_STATUS_OK ) {
free_pkb ( pkb );
free_iob ( iobuf );
break;
}
pkb_put ( pkb, length );
netdev_rx ( netdev, pkb );
iob_put ( iobuf, length );
netdev_rx ( netdev, iobuf );
--rx_quota;
}
}
@@ -146,17 +146,17 @@ static void pnic_poll ( struct net_device *netdev, unsigned int rx_quota ) {
/**************************************************************************
TRANSMIT - Transmit a frame
***************************************************************************/
static int pnic_transmit ( struct net_device *netdev, struct pk_buff *pkb ) {
static int pnic_transmit ( struct net_device *netdev, struct io_buffer *iobuf ) {
struct pnic *pnic = netdev->priv;
/* Pad the packet */
pkb_pad ( pkb, ETH_ZLEN );
iob_pad ( iobuf, ETH_ZLEN );
/* Send packet */
pnic_command ( pnic, PNIC_CMD_XMIT, pkb->data, pkb_len ( pkb ),
pnic_command ( pnic, PNIC_CMD_XMIT, iobuf->data, iob_len ( iobuf ),
NULL, 0, NULL );
netdev_tx_complete ( netdev, pkb );
netdev_tx_complete ( netdev, iobuf );
return 0;
}

38
src/drivers/net/rtl8139.c
View File

@@ -76,7 +76,7 @@
#include <gpxe/pci.h>
#include <gpxe/if_ether.h>
#include <gpxe/ethernet.h>
#include <gpxe/pkbuff.h>
#include <gpxe/iobuf.h>
#include <gpxe/netdevice.h>
#include <gpxe/spi_bit.h>
#include <gpxe/threewire.h>
@@ -86,7 +86,7 @@
struct rtl8139_tx {
unsigned int next;
struct pk_buff *pkb[TX_RING_SIZE];
struct io_buffer *iobuf[TX_RING_SIZE];
};
struct rtl8139_rx {
@@ -363,28 +363,28 @@ static void rtl_close ( struct net_device *netdev ) {
* Transmit packet
*
* @v netdev Network device
* @v pkb Packet buffer
* @v iobuf I/O buffer
* @ret rc Return status code
*/
static int rtl_transmit ( struct net_device *netdev, struct pk_buff *pkb ) {
static int rtl_transmit ( struct net_device *netdev, struct io_buffer *iobuf ) {
struct rtl8139_nic *rtl = netdev->priv;
/* Check for space in TX ring */
if ( rtl->tx.pkb[rtl->tx.next] != NULL ) {
if ( rtl->tx.iobuf[rtl->tx.next] != NULL ) {
printf ( "TX overflow\n" );
return -ENOBUFS;
}
/* Pad and align packet */
pkb_pad ( pkb, ETH_ZLEN );
iob_pad ( iobuf, ETH_ZLEN );
/* Add to TX ring */
DBG ( "TX id %d at %lx+%x\n", rtl->tx.next,
virt_to_bus ( pkb->data ), pkb_len ( pkb ) );
rtl->tx.pkb[rtl->tx.next] = pkb;
outl ( virt_to_bus ( pkb->data ),
virt_to_bus ( iobuf->data ), iob_len ( iobuf ) );
rtl->tx.iobuf[rtl->tx.next] = iobuf;
outl ( virt_to_bus ( iobuf->data ),
rtl->ioaddr + TxAddr0 + 4 * rtl->tx.next );
outl ( ( ( ( TX_FIFO_THRESH & 0x7e0 ) << 11 ) | pkb_len ( pkb ) ),
outl ( ( ( ( TX_FIFO_THRESH & 0x7e0 ) << 11 ) | iob_len ( iobuf ) ),
rtl->ioaddr + TxStatus0 + 4 * rtl->tx.next );
rtl->tx.next = ( rtl->tx.next + 1 ) % TX_RING_SIZE;
@@ -403,7 +403,7 @@ static void rtl_poll ( struct net_device *netdev, unsigned int rx_quota ) {
unsigned int tsad;
unsigned int rx_status;
unsigned int rx_len;
struct pk_buff *rx_pkb;
struct io_buffer *rx_iob;
int wrapped_len;
int i;
@@ -416,10 +416,10 @@ static void rtl_poll ( struct net_device *netdev, unsigned int rx_quota ) {
/* Handle TX completions */
tsad = inw ( rtl->ioaddr + TxSummary );
for ( i = 0 ; i < TX_RING_SIZE ; i++ ) {
if ( ( rtl->tx.pkb[i] != NULL ) && ( tsad & ( 1 << i ) ) ) {
if ( ( rtl->tx.iobuf[i] != NULL ) && ( tsad & ( 1 << i ) ) ) {
DBG ( "TX id %d complete\n", i );
netdev_tx_complete ( netdev, rtl->tx.pkb[i] );
rtl->tx.pkb[i] = NULL;
netdev_tx_complete ( netdev, rtl->tx.iobuf[i] );
rtl->tx.iobuf[i] = NULL;
}
}
@@ -433,8 +433,8 @@ static void rtl_poll ( struct net_device *netdev, unsigned int rx_quota ) {
DBG ( "RX packet at offset %x+%x\n", rtl->rx.offset,
rx_len );
rx_pkb = alloc_pkb ( rx_len );
if ( ! rx_pkb ) {
rx_iob = alloc_iob ( rx_len );
if ( ! rx_iob ) {
/* Leave packet for next call to poll() */
break;
}
@@ -444,13 +444,13 @@ static void rtl_poll ( struct net_device *netdev, unsigned int rx_quota ) {
if ( wrapped_len < 0 )
wrapped_len = 0;
memcpy ( pkb_put ( rx_pkb, rx_len - wrapped_len ),
memcpy ( iob_put ( rx_iob, rx_len - wrapped_len ),
rtl->rx.ring + rtl->rx.offset + 4,
rx_len - wrapped_len );
memcpy ( pkb_put ( rx_pkb, wrapped_len ),
memcpy ( iob_put ( rx_iob, wrapped_len ),
rtl->rx.ring, wrapped_len );
netdev_rx ( netdev, rx_pkb );
netdev_rx ( netdev, rx_iob );
rx_quota--;
} else {
DBG ( "RX bad packet (status %#04x len %d)\n",