diff options
-rw-r--r-- | drivers/net/forcedeth.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 6db6ce3e7bdb..b471d1a8ffdc 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
@@ -82,7 +82,8 @@ | |||
82 | * 0.31: 14 Nov 2004: ethtool support for getting/setting link | 82 | * 0.31: 14 Nov 2004: ethtool support for getting/setting link |
83 | * capabilities. | 83 | * capabilities. |
84 | * 0.32: 16 Apr 2005: RX_ERROR4 handling added. | 84 | * 0.32: 16 Apr 2005: RX_ERROR4 handling added. |
85 | * 0.33: 16 Mai 2005: Support for MCP51 added. | 85 | * 0.33: 16 May 2005: Support for MCP51 added. |
86 | * 0.34: 18 Jun 2005: Add DEV_NEED_LINKTIMER to all nForce nics. | ||
86 | * | 87 | * |
87 | * Known bugs: | 88 | * Known bugs: |
88 | * We suspect that on some hardware no TX done interrupts are generated. | 89 | * We suspect that on some hardware no TX done interrupts are generated. |
@@ -94,7 +95,7 @@ | |||
94 | * DEV_NEED_TIMERIRQ will not harm you on sane hardware, only generating a few | 95 | * DEV_NEED_TIMERIRQ will not harm you on sane hardware, only generating a few |
95 | * superfluous timer interrupts from the nic. | 96 | * superfluous timer interrupts from the nic. |
96 | */ | 97 | */ |
97 | #define FORCEDETH_VERSION "0.33" | 98 | #define FORCEDETH_VERSION "0.34" |
98 | #define DRV_NAME "forcedeth" | 99 | #define DRV_NAME "forcedeth" |
99 | 100 | ||
100 | #include <linux/module.h> | 101 | #include <linux/module.h> |
@@ -2218,70 +2219,70 @@ static struct pci_device_id pci_tbl[] = { | |||
2218 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_4, | 2219 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_4, |
2219 | .subvendor = PCI_ANY_ID, | 2220 | .subvendor = PCI_ANY_ID, |
2220 | .subdevice = PCI_ANY_ID, | 2221 | .subdevice = PCI_ANY_ID, |
2221 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ, | 2222 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER, |
2222 | }, | 2223 | }, |
2223 | { /* nForce3 Ethernet Controller */ | 2224 | { /* nForce3 Ethernet Controller */ |
2224 | .vendor = PCI_VENDOR_ID_NVIDIA, | 2225 | .vendor = PCI_VENDOR_ID_NVIDIA, |
2225 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_5, | 2226 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_5, |
2226 | .subvendor = PCI_ANY_ID, | 2227 | .subvendor = PCI_ANY_ID, |
2227 | .subdevice = PCI_ANY_ID, | 2228 | .subdevice = PCI_ANY_ID, |
2228 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ, | 2229 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER, |
2229 | }, | 2230 | }, |
2230 | { /* nForce3 Ethernet Controller */ | 2231 | { /* nForce3 Ethernet Controller */ |
2231 | .vendor = PCI_VENDOR_ID_NVIDIA, | 2232 | .vendor = PCI_VENDOR_ID_NVIDIA, |
2232 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_6, | 2233 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_6, |
2233 | .subvendor = PCI_ANY_ID, | 2234 | .subvendor = PCI_ANY_ID, |
2234 | .subdevice = PCI_ANY_ID, | 2235 | .subdevice = PCI_ANY_ID, |
2235 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ, | 2236 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER, |
2236 | }, | 2237 | }, |
2237 | { /* nForce3 Ethernet Controller */ | 2238 | { /* nForce3 Ethernet Controller */ |
2238 | .vendor = PCI_VENDOR_ID_NVIDIA, | 2239 | .vendor = PCI_VENDOR_ID_NVIDIA, |
2239 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_7, | 2240 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_7, |
2240 | .subvendor = PCI_ANY_ID, | 2241 | .subvendor = PCI_ANY_ID, |
2241 | .subdevice = PCI_ANY_ID, | 2242 | .subdevice = PCI_ANY_ID, |
2242 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ, | 2243 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER, |
2243 | }, | 2244 | }, |
2244 | { /* CK804 Ethernet Controller */ | 2245 | { /* CK804 Ethernet Controller */ |
2245 | .vendor = PCI_VENDOR_ID_NVIDIA, | 2246 | .vendor = PCI_VENDOR_ID_NVIDIA, |
2246 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_8, | 2247 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_8, |
2247 | .subvendor = PCI_ANY_ID, | 2248 | .subvendor = PCI_ANY_ID, |
2248 | .subdevice = PCI_ANY_ID, | 2249 | .subdevice = PCI_ANY_ID, |
2249 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ, | 2250 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER, |
2250 | }, | 2251 | }, |
2251 | { /* CK804 Ethernet Controller */ | 2252 | { /* CK804 Ethernet Controller */ |
2252 | .vendor = PCI_VENDOR_ID_NVIDIA, | 2253 | .vendor = PCI_VENDOR_ID_NVIDIA, |
2253 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_9, | 2254 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_9, |
2254 | .subvendor = PCI_ANY_ID, | 2255 | .subvendor = PCI_ANY_ID, |
2255 | .subdevice = PCI_ANY_ID, | 2256 | .subdevice = PCI_ANY_ID, |
2256 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ, | 2257 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER, |
2257 | }, | 2258 | }, |
2258 | { /* MCP04 Ethernet Controller */ | 2259 | { /* MCP04 Ethernet Controller */ |
2259 | .vendor = PCI_VENDOR_ID_NVIDIA, | 2260 | .vendor = PCI_VENDOR_ID_NVIDIA, |
2260 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_10, | 2261 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_10, |
2261 | .subvendor = PCI_ANY_ID, | 2262 | .subvendor = PCI_ANY_ID, |
2262 | .subdevice = PCI_ANY_ID, | 2263 | .subdevice = PCI_ANY_ID, |
2263 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ, | 2264 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER, |
2264 | }, | 2265 | }, |
2265 | { /* MCP04 Ethernet Controller */ | 2266 | { /* MCP04 Ethernet Controller */ |
2266 | .vendor = PCI_VENDOR_ID_NVIDIA, | 2267 | .vendor = PCI_VENDOR_ID_NVIDIA, |
2267 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_11, | 2268 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_11, |
2268 | .subvendor = PCI_ANY_ID, | 2269 | .subvendor = PCI_ANY_ID, |
2269 | .subdevice = PCI_ANY_ID, | 2270 | .subdevice = PCI_ANY_ID, |
2270 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ, | 2271 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER, |
2271 | }, | 2272 | }, |
2272 | { /* MCP51 Ethernet Controller */ | 2273 | { /* MCP51 Ethernet Controller */ |
2273 | .vendor = PCI_VENDOR_ID_NVIDIA, | 2274 | .vendor = PCI_VENDOR_ID_NVIDIA, |
2274 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_12, | 2275 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_12, |
2275 | .subvendor = PCI_ANY_ID, | 2276 | .subvendor = PCI_ANY_ID, |
2276 | .subdevice = PCI_ANY_ID, | 2277 | .subdevice = PCI_ANY_ID, |
2277 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ, | 2278 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER, |
2278 | }, | 2279 | }, |
2279 | { /* MCP51 Ethernet Controller */ | 2280 | { /* MCP51 Ethernet Controller */ |
2280 | .vendor = PCI_VENDOR_ID_NVIDIA, | 2281 | .vendor = PCI_VENDOR_ID_NVIDIA, |
2281 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_13, | 2282 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_13, |
2282 | .subvendor = PCI_ANY_ID, | 2283 | .subvendor = PCI_ANY_ID, |
2283 | .subdevice = PCI_ANY_ID, | 2284 | .subdevice = PCI_ANY_ID, |
2284 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ, | 2285 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER, |
2285 | }, | 2286 | }, |
2286 | {0,}, | 2287 | {0,}, |
2287 | }; | 2288 | }; |