]>
Commit | Line | Data |
---|---|---|
6f838224 | 1 | --- linux-2.6.19/drivers/net/forcedeth.c.orig 2006-09-20 05:42:06.000000000 +0200 |
2 | +++ linux-2.6.19/drivers/net/forcedeth.c 2006-11-25 14:19:31.000000000 +0100 | |
2380c486 | 3 | @@ -166,7 +166,8 @@ |
108d57cb | 4 | * Hardware access: |
5 | */ | |
6 | ||
13e5c3b1 AM |
7 | -#define DEV_NEED_TIMERIRQ 0x0000001 /* set the timer irq flag in the irq mask */ |
8 | +#define DEV_NEED_TIMERIRQ_ORIG 0x0000001 /* set the timer irq flag in the irq mask */ | |
9 | +#define DEV_NEED_TIMERIRQ 0x0000000 /* work-around for Wake-On-Lan functionality */ | |
10 | #define DEV_NEED_LINKTIMER 0x0000002 /* poll link settings. Relies on the timer irq */ | |
11 | #define DEV_HAS_LARGEDESC 0x0000004 /* device supports jumbo frames and needs packet format 2 */ | |
12 | #define DEV_HAS_HIGH_DMA 0x0000008 /* device supports 64bit dma */ | |
108d57cb | 13 | @@ -4342,7 +4343,7 @@ |
14 | np->msi_flags |= 0x0001; | |
15 | } | |
16 | ||
17 | - if (id->driver_data & DEV_NEED_TIMERIRQ) | |
18 | + if (id->driver_data & DEV_NEED_TIMERIRQ_ORIG) | |
19 | np->irqmask |= NVREG_IRQ_TIMER; | |
20 | if (id->driver_data & DEV_NEED_LINKTIMER) { | |
21 | dprintk(KERN_INFO "%s: link timer on.\n", pci_name(pci_dev)); | |
22 | @@ -4562,7 +4563,7 @@ | |
23 | MODULE_PARM_DESC(dma_64bit, "High DMA is enabled by setting to 1 and disabled by setting to 0."); | |
24 | ||
25 | MODULE_AUTHOR("Manfred Spraul <manfred@colorfullife.com>"); | |
26 | -MODULE_DESCRIPTION("Reverse Engineered nForce ethernet driver"); | |
27 | +MODULE_DESCRIPTION("Reverse Engineered nForce ethernet driver (TIMERIRQ DISABLED)"); | |
28 | MODULE_LICENSE("GPL"); | |
29 | ||
30 | MODULE_DEVICE_TABLE(pci, pci_tbl); |