diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
| commit | d18bfacff20f08aecf01bb971b110ca108eef3c7 (patch) | |
| tree | 255f862839c593c796e609328575b611e3f56cf3 /drivers/net/dl2k.c | |
| parent | a68db763af9b676590c3fe9ec3f17bf18015eb2f (diff) | |
| parent | fd782a4a99d2d3e818b9465c427b10f7f027d7da (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/net/dl2k.c')
| -rw-r--r-- | drivers/net/dl2k.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c index aa42b7a27735..430c628279b3 100644 --- a/drivers/net/dl2k.c +++ b/drivers/net/dl2k.c | |||
| @@ -547,7 +547,7 @@ rio_timer (unsigned long data) | |||
| 547 | skb_reserve (skb, 2); | 547 | skb_reserve (skb, 2); |
| 548 | np->rx_ring[entry].fraginfo = | 548 | np->rx_ring[entry].fraginfo = |
| 549 | cpu_to_le64 (pci_map_single | 549 | cpu_to_le64 (pci_map_single |
| 550 | (np->pdev, skb->tail, np->rx_buf_sz, | 550 | (np->pdev, skb->data, np->rx_buf_sz, |
| 551 | PCI_DMA_FROMDEVICE)); | 551 | PCI_DMA_FROMDEVICE)); |
| 552 | } | 552 | } |
| 553 | np->rx_ring[entry].fraginfo |= | 553 | np->rx_ring[entry].fraginfo |= |
| @@ -618,7 +618,7 @@ alloc_list (struct net_device *dev) | |||
| 618 | /* Rubicon now supports 40 bits of addressing space. */ | 618 | /* Rubicon now supports 40 bits of addressing space. */ |
| 619 | np->rx_ring[i].fraginfo = | 619 | np->rx_ring[i].fraginfo = |
| 620 | cpu_to_le64 ( pci_map_single ( | 620 | cpu_to_le64 ( pci_map_single ( |
| 621 | np->pdev, skb->tail, np->rx_buf_sz, | 621 | np->pdev, skb->data, np->rx_buf_sz, |
| 622 | PCI_DMA_FROMDEVICE)); | 622 | PCI_DMA_FROMDEVICE)); |
| 623 | np->rx_ring[i].fraginfo |= cpu_to_le64 (np->rx_buf_sz) << 48; | 623 | np->rx_ring[i].fraginfo |= cpu_to_le64 (np->rx_buf_sz) << 48; |
| 624 | } | 624 | } |
| @@ -906,7 +906,7 @@ receive_packet (struct net_device *dev) | |||
| 906 | /* 16 byte align the IP header */ | 906 | /* 16 byte align the IP header */ |
| 907 | skb_reserve (skb, 2); | 907 | skb_reserve (skb, 2); |
| 908 | eth_copy_and_sum (skb, | 908 | eth_copy_and_sum (skb, |
| 909 | np->rx_skbuff[entry]->tail, | 909 | np->rx_skbuff[entry]->data, |
| 910 | pkt_len, 0); | 910 | pkt_len, 0); |
| 911 | skb_put (skb, pkt_len); | 911 | skb_put (skb, pkt_len); |
| 912 | pci_dma_sync_single_for_device(np->pdev, | 912 | pci_dma_sync_single_for_device(np->pdev, |
| @@ -950,7 +950,7 @@ receive_packet (struct net_device *dev) | |||
| 950 | skb_reserve (skb, 2); | 950 | skb_reserve (skb, 2); |
| 951 | np->rx_ring[entry].fraginfo = | 951 | np->rx_ring[entry].fraginfo = |
| 952 | cpu_to_le64 (pci_map_single | 952 | cpu_to_le64 (pci_map_single |
| 953 | (np->pdev, skb->tail, np->rx_buf_sz, | 953 | (np->pdev, skb->data, np->rx_buf_sz, |
| 954 | PCI_DMA_FROMDEVICE)); | 954 | PCI_DMA_FROMDEVICE)); |
| 955 | } | 955 | } |
| 956 | np->rx_ring[entry].fraginfo |= | 956 | np->rx_ring[entry].fraginfo |= |