net driver fixes
Subsystems (2)
PATCH 1/1 net driver fixes
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream-linus
to receive the following updates:
drivers/net/lp486e.c | 6 +++--- drivers/net/mv643xx_eth.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
Jeff Garzik:
[netdrvr] lp486e: fix typo
[netdrvr] mv643xx_eth: fix obvious typo, which caused build breakage
drivers/net/lp486e.c +3 -3
@@ -442,16 +442,16 @@ #if 0if (rbd) { rbd->pad =0 ; rbd->count =0 ; - rbd->skb =dev_alloc_skb (RX_SKB_SIZE ); + rbd->skb =dev_alloc_skb (RX_SKBSIZE );if (!rbd->skb) {printk ("dev_alloc_skb failed" ); } rbd->next = rfd->rbd;if (i) { rfd->rbd->prev = rbd; - rbd->size =RX_SKB_SIZE ; + rbd->size =RX_SKBSIZE ; }else { - rbd->size = (RX_SKB_SIZE |RBD_EL ); + rbd->size = (RX_SKBSIZE |RBD_EL ); lp->rbd_tail = rbd; }
drivers/net/mv643xx_eth.c +1 -1
@@ -385,7 +385,7 @@ static int mv643xx_eth_receive_queue(strstruct pkt_info pkt_info;while (budget-- >0 &ð_port_receive (mp, &pkt_info) ==ETH_OK ) { -dma_unmap_single (NULL , pkt_info.buf_ptr,RX_SKB_SIZE , +dma_unmap_single (NULL , pkt_info.buf_ptr,ETH_RX_SKB_SIZE ,DMA_FROM_DEVICE ); mp->rx_desc_count--; received_packets++;