git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
net
/
amd8111e.c
diff --git
a/drivers/net/amd8111e.c
b/drivers/net/amd8111e.c
index
b7dd726
..
d9ba8be
100755
(executable)
--- a/
drivers/net/amd8111e.c
+++ b/
drivers/net/amd8111e.c
@@
-87,6
+87,7
@@
Revision History:
#include <linux/if_vlan.h>
#include <linux/ctype.h>
#include <linux/crc32.h>
#include <linux/if_vlan.h>
#include <linux/ctype.h>
#include <linux/crc32.h>
+#include <linux/dma-mapping.h>
#include <asm/system.h>
#include <asm/io.h>
#include <asm/system.h>
#include <asm/io.h>
@@
-1289,7
+1290,7
@@
static irqreturn_t amd8111e_interrupt(int irq, void *dev_id, struct pt_regs *reg
writel(intr0, mmio + INT0);
/* Check if Receive Interrupt has occurred. */
writel(intr0, mmio + INT0);
/* Check if Receive Interrupt has occurred. */
-#if CONFIG_AMD8111E_NAPI
+#if
def
CONFIG_AMD8111E_NAPI
if(intr0 & RINT0){
if(netif_rx_schedule_prep(dev)){
/* Disable receive interupts */
if(intr0 & RINT0){
if(netif_rx_schedule_prep(dev)){
/* Disable receive interupts */
@@
-2006,12
+2007,11
@@
static int __devinit amd8111e_probe_one(struct pci_dev *pdev,
}
/* Initialize DMA */
}
/* Initialize DMA */
- if
(!pci_dma_supported(pdev, 0xffffffff))
{
+ if
(pci_set_dma_mask(pdev, DMA_32BIT_MASK) < 0)
{
printk(KERN_ERR "amd8111e: DMA not supported,"
"exiting.\n");
printk(KERN_ERR "amd8111e: DMA not supported,"
"exiting.\n");
- goto err_free_reg;
- } else
- pdev->dma_mask = 0xffffffff;
+ goto err_free_reg;
+ }
reg_addr = pci_resource_start(pdev, 0);
reg_len = pci_resource_len(pdev, 0);
reg_addr = pci_resource_start(pdev, 0);
reg_len = pci_resource_len(pdev, 0);