dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  [netdrvr] mv643xx_eth: fix obvious typo, which caused build breakage
  [netdrvr] lp486e: fix typo
This commit is contained in:
Linus Torvalds 2006-09-22 15:37:31 -07:00
parent e6e5fee142 54caf44da3
commit 3e2ab46df6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/lp486e.c
View File

@ -442,16 +442,16 @@ init_rx_bufs(struct net_device *dev, int num) {
if (rbd) { if (rbd) {
rbd->pad = 0; rbd->pad = 0;
rbd->count = 0; rbd->count = 0;
rbd->skb = dev_alloc_skb(RX_SKB_SIZE); rbd->skb = dev_alloc_skb(RX_SKBSIZE);
if (!rbd->skb) { if (!rbd->skb) {
printk("dev_alloc_skb failed"); printk("dev_alloc_skb failed");
} }
rbd->next = rfd->rbd; rbd->next = rfd->rbd;
if (i) { if (i) {
rfd->rbd->prev = rbd; rfd->rbd->prev = rbd;
rbd->size = RX_SKB_SIZE; rbd->size = RX_SKBSIZE;
} else { } else {
rbd->size = (RX_SKB_SIZE | RBD_EL); rbd->size = (RX_SKBSIZE | RBD_EL);
lp->rbd_tail = rbd; lp->rbd_tail = rbd;
} }

2
drivers/net/mv643xx_eth.c
View File

@ -385,7 +385,7 @@ static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
struct pkt_info pkt_info; struct pkt_info pkt_info;
while (budget-- > 0 && eth_port_receive(mp, &pkt_info) == ETH_OK) { while (budget-- > 0 && eth_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); DMA_FROM_DEVICE);
mp->rx_desc_count--; mp->rx_desc_count--;
received_packets++; received_packets++;