/[linux-patches]/genpatches-2.6/tags/2.6.12-12/4310_forcedeth-mcp51.patch
Gentoo

Contents of /genpatches-2.6/tags/2.6.12-12/4310_forcedeth-mcp51.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 137 - (show annotations) (download)
Tue Aug 9 21:23:12 2005 UTC (12 years, 11 months ago) by dsd
File size: 2463 byte(s)
2.6.12-12 release
1 manfred@colorfullife.com
2 [PATCH] forcedeth: add two new pci ids
3 [PATCH] forcedeth: add two new pci ids
4
5 This is a multi-part message in MIME format.
6
7 ---
8 commit 9992d4aa6b3b169a7903e029fc2c3eaa4b4055a1
9 tree d29ffe85108f02b058af699bdebe2eac887d41d5
10 parent 4f2ad81104a18946c64215adffce50c2a659fddd
11 author Manfred Spraul <manfred@colorfullife.com> Sun, 05 Jun 2005 17:04:11 +0200
12 committer Jeff Garzik <jgarzik@pobox.com> Mon, 27 Jun 2005 01:12:28 -0400
13
14 drivers/net/forcedeth.c | 21 +++++++++++++++++++--
15 1 files changed, 19 insertions(+), 2 deletions(-)
16
17 diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
18 --- a/drivers/net/forcedeth.c
19 +++ b/drivers/net/forcedeth.c
20 @@ -82,6 +82,7 @@
21 * 0.31: 14 Nov 2004: ethtool support for getting/setting link
22 * capabilities.
23 * 0.32: 16 Apr 2005: RX_ERROR4 handling added.
24 + * 0.33: 16 Mai 2005: Support for MCP51 added.
25 *
26 * Known bugs:
27 * We suspect that on some hardware no TX done interrupts are generated.
28 @@ -93,7 +94,7 @@
29 * DEV_NEED_TIMERIRQ will not harm you on sane hardware, only generating a few
30 * superfluous timer interrupts from the nic.
31 */
32 -#define FORCEDETH_VERSION "0.32"
33 +#define FORCEDETH_VERSION "0.33"
34 #define DRV_NAME "forcedeth"
35
36 #include <linux/module.h>
37 @@ -2005,7 +2006,9 @@ static int __devinit nv_probe(struct pci
38 /* handle different descriptor versions */
39 if (pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_1 ||
40 pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_2 ||
41 - pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_3)
42 + pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_3 ||
43 + pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_12 ||
44 + pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_13)
45 np->desc_ver = DESC_VER_1;
46 else
47 np->desc_ver = DESC_VER_2;
48 @@ -2266,6 +2269,20 @@ static struct pci_device_id pci_tbl[] =
49 .subdevice = PCI_ANY_ID,
50 .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ,
51 },
52 + { /* MCP51 Ethernet Controller */
53 + .vendor = PCI_VENDOR_ID_NVIDIA,
54 + .device = PCI_DEVICE_ID_NVIDIA_NVENET_12,
55 + .subvendor = PCI_ANY_ID,
56 + .subdevice = PCI_ANY_ID,
57 + .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ,
58 + },
59 + { /* MCP51 Ethernet Controller */
60 + .vendor = PCI_VENDOR_ID_NVIDIA,
61 + .device = PCI_DEVICE_ID_NVIDIA_NVENET_13,
62 + .subvendor = PCI_ANY_ID,
63 + .subdevice = PCI_ANY_ID,
64 + .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ,
65 + },
66 {0,},
67 };
68

  ViewVC Help
Powered by ViewVC 1.1.20