diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-29 00:24:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-29 00:24:32 -0400 |
| commit | a839688362e32f01608838516036697e30618b39 (patch) | |
| tree | a174d93d568ba9735b13bb6ebb5f1a36c8f56308 /drivers/net/tulip/interrupt.c | |
| parent | 2fa938b8a3964c21b23d9d095091e7abc88249c5 (diff) | |
| parent | 12dc2fdd3e6067f5137e4a6d8af0b1a994952f52 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/tulip/interrupt.c')
| -rw-r--r-- | drivers/net/tulip/interrupt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c index afb5cda9d8e1..bb3558164a5b 100644 --- a/drivers/net/tulip/interrupt.c +++ b/drivers/net/tulip/interrupt.c | |||
| @@ -78,7 +78,7 @@ int tulip_refill_rx(struct net_device *dev) | |||
| 78 | if (skb == NULL) | 78 | if (skb == NULL) |
| 79 | break; | 79 | break; |
| 80 | 80 | ||
| 81 | mapping = pci_map_single(tp->pdev, skb->tail, PKT_BUF_SZ, | 81 | mapping = pci_map_single(tp->pdev, skb->data, PKT_BUF_SZ, |
| 82 | PCI_DMA_FROMDEVICE); | 82 | PCI_DMA_FROMDEVICE); |
| 83 | tp->rx_buffers[entry].mapping = mapping; | 83 | tp->rx_buffers[entry].mapping = mapping; |
| 84 | 84 | ||
| @@ -199,12 +199,12 @@ int tulip_poll(struct net_device *dev, int *budget) | |||
| 199 | tp->rx_buffers[entry].mapping, | 199 | tp->rx_buffers[entry].mapping, |
| 200 | pkt_len, PCI_DMA_FROMDEVICE); | 200 | pkt_len, PCI_DMA_FROMDEVICE); |
| 201 | #if ! defined(__alpha__) | 201 | #if ! defined(__alpha__) |
| 202 | eth_copy_and_sum(skb, tp->rx_buffers[entry].skb->tail, | 202 | eth_copy_and_sum(skb, tp->rx_buffers[entry].skb->data, |
| 203 | pkt_len, 0); | 203 | pkt_len, 0); |
| 204 | skb_put(skb, pkt_len); | 204 | skb_put(skb, pkt_len); |
| 205 | #else | 205 | #else |
| 206 | memcpy(skb_put(skb, pkt_len), | 206 | memcpy(skb_put(skb, pkt_len), |
| 207 | tp->rx_buffers[entry].skb->tail, | 207 | tp->rx_buffers[entry].skb->data, |
| 208 | pkt_len); | 208 | pkt_len); |
| 209 | #endif | 209 | #endif |
| 210 | pci_dma_sync_single_for_device(tp->pdev, | 210 | pci_dma_sync_single_for_device(tp->pdev, |
| @@ -423,12 +423,12 @@ static int tulip_rx(struct net_device *dev) | |||
| 423 | tp->rx_buffers[entry].mapping, | 423 | tp->rx_buffers[entry].mapping, |
| 424 | pkt_len, PCI_DMA_FROMDEVICE); | 424 | pkt_len, PCI_DMA_FROMDEVICE); |
| 425 | #if ! defined(__alpha__) | 425 | #if ! defined(__alpha__) |
| 426 | eth_copy_and_sum(skb, tp->rx_buffers[entry].skb->tail, | 426 | eth_copy_and_sum(skb, tp->rx_buffers[entry].skb->data, |
| 427 | pkt_len, 0); | 427 | pkt_len, 0); |
| 428 | skb_put(skb, pkt_len); | 428 | skb_put(skb, pkt_len); |
| 429 | #else | 429 | #else |
| 430 | memcpy(skb_put(skb, pkt_len), | 430 | memcpy(skb_put(skb, pkt_len), |
| 431 | tp->rx_buffers[entry].skb->tail, | 431 | tp->rx_buffers[entry].skb->data, |
| 432 | pkt_len); | 432 | pkt_len); |
| 433 | #endif | 433 | #endif |
| 434 | pci_dma_sync_single_for_device(tp->pdev, | 434 | pci_dma_sync_single_for_device(tp->pdev, |