]> git.pld-linux.org Git - packages/kernel.git/blame - linux-2.6-forcedeth-WON.patch
- mention apparmor in release
[packages/kernel.git] / linux-2.6-forcedeth-WON.patch
CommitLineData
a3b93527 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
b689869c 3@@ -166,7 +166,8 @@
a3b93527 4 * Hardware access:
5 */
6
b689869c 7-#define DEV_NEED_TIMERIRQ 0x00001 /* set the timer irq flag in the irq mask */
8+#define DEV_NEED_TIMERIRQ_ORIG 0x00001 /* set the timer irq flag in the irq mask */
9+#define DEV_NEED_TIMERIRQ 0x00000 /* work-around for Wake-On-Lan functionality */
10 #define DEV_NEED_LINKTIMER 0x00002 /* poll link settings. Relies on the timer irq */
11 #define DEV_HAS_LARGEDESC 0x00004 /* device supports jumbo frames and needs packet format 2 */
12 #define DEV_HAS_HIGH_DMA 0x00008 /* device supports 64bit dma */
a3b93527 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);
This page took 0.043176 seconds and 4 git commands to generate.