# HG changeset patch # User Florian Pose # Date 1236587742 0 # Node ID 901a432d45314a17a31d2fb0cfd4f15db5480365 # Parent d55a393f32d2deec737c08fefb13bc585385fdcb Fixed compile error in e1000 driver for 2.6.26. diff -r d55a393f32d2 -r 901a432d4531 devices/e1000/e1000_ethtool-2.6.26-ethercat.c --- a/devices/e1000/e1000_ethtool-2.6.26-ethercat.c Tue Feb 24 13:44:01 2009 +0000 +++ b/devices/e1000/e1000_ethtool-2.6.26-ethercat.c Mon Mar 09 08:35:42 2009 +0000 @@ -1042,7 +1042,7 @@ if (txdr->desc && txdr->buffer_info) { for (i = 0; i < txdr->count; i++) { if (txdr->buffer_info[i].dma) - pci_unmap_single(pdev, txdr->buffer_info[i]dma, + pci_unmap_single(pdev, txdr->buffer_info[i].dma, txdr->buffer_info[i].length, PCI_DMA_TODEVICE); if (txdr->buffer_info[i].skb) @@ -1053,7 +1053,7 @@ if (rxdr->desc && rxdr->buffer_info) { for (i = 0; i < rxdr->count; i++) { if (rxdr->buffer_info[i].dma) - pci_unmap_single(pdev, rxdr->buffer_info[i]dma, + pci_unmap_single(pdev, rxdr->buffer_info[i].dma, rxdr->buffer_info[i].length, PCI_DMA_FROMDEVICE); if (rxdr->buffer_info[i].skb) diff -r d55a393f32d2 -r 901a432d4531 devices/e1000/e1000_ethtool-2.6.26-orig.c --- a/devices/e1000/e1000_ethtool-2.6.26-orig.c Tue Feb 24 13:44:01 2009 +0000 +++ b/devices/e1000/e1000_ethtool-2.6.26-orig.c Mon Mar 09 08:35:42 2009 +0000 @@ -1028,7 +1028,7 @@ if (txdr->desc && txdr->buffer_info) { for (i = 0; i < txdr->count; i++) { if (txdr->buffer_info[i].dma) - pci_unmap_single(pdev, txdr->buffer_info[i]dma, + pci_unmap_single(pdev, txdr->buffer_info[i].dma, txdr->buffer_info[i].length, PCI_DMA_TODEVICE); if (txdr->buffer_info[i].skb) @@ -1039,7 +1039,7 @@ if (rxdr->desc && rxdr->buffer_info) { for (i = 0; i < rxdr->count; i++) { if (rxdr->buffer_info[i].dma) - pci_unmap_single(pdev, rxdr->buffer_info[i]dma, + pci_unmap_single(pdev, rxdr->buffer_info[i].dma, rxdr->buffer_info[i].length, PCI_DMA_FROMDEVICE); if (rxdr->buffer_info[i].skb)