aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e100.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-11-19 02:38:23 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-19 02:38:23 -0500
commit198d6ba4d7f48c94f990f4604f0b3d73925e0ded (patch)
tree56bbdf8ba2553c23c8099da9344a8f1d1aba97ab /drivers/net/e100.c
parent9a57f7fabd383920585ed8b74eacd117c6551f2d (diff)
parent7f0f598a0069d1ab072375965a4b69137233169c (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/isdn/i4l/isdn_net.c fs/cifs/connect.c
Diffstat (limited to 'drivers/net/e100.c')
-rw-r--r--drivers/net/e100.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 62cdefa2a4f0..c9c707980865 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -166,7 +166,7 @@
166 166
167#define DRV_NAME "e100" 167#define DRV_NAME "e100"
168#define DRV_EXT "-NAPI" 168#define DRV_EXT "-NAPI"
169#define DRV_VERSION "3.5.23-k4"DRV_EXT 169#define DRV_VERSION "3.5.23-k6"DRV_EXT
170#define DRV_DESCRIPTION "Intel(R) PRO/100 Network Driver" 170#define DRV_DESCRIPTION "Intel(R) PRO/100 Network Driver"
171#define DRV_COPYRIGHT "Copyright(c) 1999-2006 Intel Corporation" 171#define DRV_COPYRIGHT "Copyright(c) 1999-2006 Intel Corporation"
172#define PFX DRV_NAME ": " 172#define PFX DRV_NAME ": "
@@ -1804,7 +1804,7 @@ static int e100_rx_alloc_skb(struct nic *nic, struct rx *rx)
1804 struct rfd *prev_rfd = (struct rfd *)rx->prev->skb->data; 1804 struct rfd *prev_rfd = (struct rfd *)rx->prev->skb->data;
1805 put_unaligned_le32(rx->dma_addr, &prev_rfd->link); 1805 put_unaligned_le32(rx->dma_addr, &prev_rfd->link);
1806 pci_dma_sync_single_for_device(nic->pdev, rx->prev->dma_addr, 1806 pci_dma_sync_single_for_device(nic->pdev, rx->prev->dma_addr,
1807 sizeof(struct rfd), PCI_DMA_TODEVICE); 1807 sizeof(struct rfd), PCI_DMA_BIDIRECTIONAL);
1808 } 1808 }
1809 1809
1810 return 0; 1810 return 0;
@@ -1823,7 +1823,7 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx,
1823 1823
1824 /* Need to sync before taking a peek at cb_complete bit */ 1824 /* Need to sync before taking a peek at cb_complete bit */
1825 pci_dma_sync_single_for_cpu(nic->pdev, rx->dma_addr, 1825 pci_dma_sync_single_for_cpu(nic->pdev, rx->dma_addr,
1826 sizeof(struct rfd), PCI_DMA_FROMDEVICE); 1826 sizeof(struct rfd), PCI_DMA_BIDIRECTIONAL);
1827 rfd_status = le16_to_cpu(rfd->status); 1827 rfd_status = le16_to_cpu(rfd->status);
1828 1828
1829 DPRINTK(RX_STATUS, DEBUG, "status=0x%04X\n", rfd_status); 1829 DPRINTK(RX_STATUS, DEBUG, "status=0x%04X\n", rfd_status);
@@ -1850,7 +1850,7 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx,
1850 1850
1851 /* Get data */ 1851 /* Get data */
1852 pci_unmap_single(nic->pdev, rx->dma_addr, 1852 pci_unmap_single(nic->pdev, rx->dma_addr,
1853 RFD_BUF_LEN, PCI_DMA_FROMDEVICE); 1853 RFD_BUF_LEN, PCI_DMA_BIDIRECTIONAL);
1854 1854
1855 /* If this buffer has the el bit, but we think the receiver 1855 /* If this buffer has the el bit, but we think the receiver
1856 * is still running, check to see if it really stopped while 1856 * is still running, check to see if it really stopped while
@@ -1942,7 +1942,7 @@ static void e100_rx_clean(struct nic *nic, unsigned int *work_done,
1942 new_before_last_rfd->command |= cpu_to_le16(cb_el); 1942 new_before_last_rfd->command |= cpu_to_le16(cb_el);
1943 pci_dma_sync_single_for_device(nic->pdev, 1943 pci_dma_sync_single_for_device(nic->pdev,
1944 new_before_last_rx->dma_addr, sizeof(struct rfd), 1944 new_before_last_rx->dma_addr, sizeof(struct rfd),
1945 PCI_DMA_TODEVICE); 1945 PCI_DMA_BIDIRECTIONAL);
1946 1946
1947 /* Now that we have a new stopping point, we can clear the old 1947 /* Now that we have a new stopping point, we can clear the old
1948 * stopping point. We must sync twice to get the proper 1948 * stopping point. We must sync twice to get the proper
@@ -1950,11 +1950,11 @@ static void e100_rx_clean(struct nic *nic, unsigned int *work_done,
1950 old_before_last_rfd->command &= ~cpu_to_le16(cb_el); 1950 old_before_last_rfd->command &= ~cpu_to_le16(cb_el);
1951 pci_dma_sync_single_for_device(nic->pdev, 1951 pci_dma_sync_single_for_device(nic->pdev,
1952 old_before_last_rx->dma_addr, sizeof(struct rfd), 1952 old_before_last_rx->dma_addr, sizeof(struct rfd),
1953 PCI_DMA_TODEVICE); 1953 PCI_DMA_BIDIRECTIONAL);
1954 old_before_last_rfd->size = cpu_to_le16(VLAN_ETH_FRAME_LEN); 1954 old_before_last_rfd->size = cpu_to_le16(VLAN_ETH_FRAME_LEN);
1955 pci_dma_sync_single_for_device(nic->pdev, 1955 pci_dma_sync_single_for_device(nic->pdev,
1956 old_before_last_rx->dma_addr, sizeof(struct rfd), 1956 old_before_last_rx->dma_addr, sizeof(struct rfd),
1957 PCI_DMA_TODEVICE); 1957 PCI_DMA_BIDIRECTIONAL);
1958 } 1958 }
1959 1959
1960 if(restart_required) { 1960 if(restart_required) {
@@ -1977,7 +1977,7 @@ static void e100_rx_clean_list(struct nic *nic)
1977 for(rx = nic->rxs, i = 0; i < count; rx++, i++) { 1977 for(rx = nic->rxs, i = 0; i < count; rx++, i++) {
1978 if(rx->skb) { 1978 if(rx->skb) {
1979 pci_unmap_single(nic->pdev, rx->dma_addr, 1979 pci_unmap_single(nic->pdev, rx->dma_addr,
1980 RFD_BUF_LEN, PCI_DMA_FROMDEVICE); 1980 RFD_BUF_LEN, PCI_DMA_BIDIRECTIONAL);
1981 dev_kfree_skb(rx->skb); 1981 dev_kfree_skb(rx->skb);
1982 } 1982 }
1983 } 1983 }
@@ -2020,7 +2020,7 @@ static int e100_rx_alloc_list(struct nic *nic)
2020 before_last->command |= cpu_to_le16(cb_el); 2020 before_last->command |= cpu_to_le16(cb_el);
2021 before_last->size = 0; 2021 before_last->size = 0;
2022 pci_dma_sync_single_for_device(nic->pdev, rx->dma_addr, 2022 pci_dma_sync_single_for_device(nic->pdev, rx->dma_addr,
2023 sizeof(struct rfd), PCI_DMA_TODEVICE); 2023 sizeof(struct rfd), PCI_DMA_BIDIRECTIONAL);
2024 2024
2025 nic->rx_to_use = nic->rx_to_clean = nic->rxs; 2025 nic->rx_to_use = nic->rx_to_clean = nic->rxs;
2026 nic->ru_running = RU_SUSPENDED; 2026 nic->ru_running = RU_SUSPENDED;
@@ -2221,7 +2221,7 @@ static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode)
2221 msleep(10); 2221 msleep(10);
2222 2222
2223 pci_dma_sync_single_for_cpu(nic->pdev, nic->rx_to_clean->dma_addr, 2223 pci_dma_sync_single_for_cpu(nic->pdev, nic->rx_to_clean->dma_addr,
2224 RFD_BUF_LEN, PCI_DMA_FROMDEVICE); 2224 RFD_BUF_LEN, PCI_DMA_BIDIRECTIONAL);
2225 2225
2226 if(memcmp(nic->rx_to_clean->skb->data + sizeof(struct rfd), 2226 if(memcmp(nic->rx_to_clean->skb->data + sizeof(struct rfd),
2227 skb->data, ETH_DATA_LEN)) 2227 skb->data, ETH_DATA_LEN))