aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/forcedeth.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/forcedeth.c')
-rw-r--r--drivers/net/forcedeth.c21
1 files changed, 19 insertions, 2 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 4ebcd052e150..6db6ce3e7bdb 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -82,6 +82,7 @@
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 * 86 *
86 * Known bugs: 87 * Known bugs:
87 * We suspect that on some hardware no TX done interrupts are generated. 88 * We suspect that on some hardware no TX done interrupts are generated.
@@ -93,7 +94,7 @@
93 * DEV_NEED_TIMERIRQ will not harm you on sane hardware, only generating a few 94 * DEV_NEED_TIMERIRQ will not harm you on sane hardware, only generating a few
94 * superfluous timer interrupts from the nic. 95 * superfluous timer interrupts from the nic.
95 */ 96 */
96#define FORCEDETH_VERSION "0.32" 97#define FORCEDETH_VERSION "0.33"
97#define DRV_NAME "forcedeth" 98#define DRV_NAME "forcedeth"
98 99
99#include <linux/module.h> 100#include <linux/module.h>
@@ -2005,7 +2006,9 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
2005 /* handle different descriptor versions */ 2006 /* handle different descriptor versions */
2006 if (pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_1 || 2007 if (pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_1 ||
2007 pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_2 || 2008 pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_2 ||
2008 pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_3) 2009 pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_3 ||
2010 pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_12 ||
2011 pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_13)
2009 np->desc_ver = DESC_VER_1; 2012 np->desc_ver = DESC_VER_1;
2010 else 2013 else
2011 np->desc_ver = DESC_VER_2; 2014 np->desc_ver = DESC_VER_2;
@@ -2266,6 +2269,20 @@ static struct pci_device_id pci_tbl[] = {
2266 .subdevice = PCI_ANY_ID, 2269 .subdevice = PCI_ANY_ID,
2267 .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ, 2270 .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ,
2268 }, 2271 },
2272 { /* MCP51 Ethernet Controller */
2273 .vendor = PCI_VENDOR_ID_NVIDIA,
2274 .device = PCI_DEVICE_ID_NVIDIA_NVENET_12,
2275 .subvendor = PCI_ANY_ID,
2276 .subdevice = PCI_ANY_ID,
2277 .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ,
2278 },
2279 { /* MCP51 Ethernet Controller */
2280 .vendor = PCI_VENDOR_ID_NVIDIA,
2281 .device = PCI_DEVICE_ID_NVIDIA_NVENET_13,
2282 .subvendor = PCI_ANY_ID,
2283 .subdevice = PCI_ANY_ID,
2284 .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ,
2285 },
2269 {0,}, 2286 {0,},
2270}; 2287};
2271 2288