/[linux-patches]/genpatches-2.6/tags/2.6.12-12/4312_forcedeth-mcp55.patch
Gentoo

Contents of /genpatches-2.6/tags/2.6.12-12/4312_forcedeth-mcp55.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: 2596 byte(s)
2.6.12-12 release
1 manfred@colorfullife.com
2 [PATCH] forcedeth: Add support for new device id
3 [PATCH] forcedeth: Add support for new device id
4
5 This is a multi-part message in MIME format.
6
7 ---
8 commit f49d16ef2d6f008119d4ee2c895781fb229bad68
9 tree 6c922b3b6d49f17563f0fd1f7ee67711f8e64813
10 parent 8f767fc83cf4e4f1241b5a0b949b54088d075411
11 author Manfred Spraul <manfred@colorfullife.com> Sun, 26 Jun 2005 11:04:52 +0200
12 committer Jeff Garzik <jgarzik@pobox.com> Mon, 27 Jun 2005 01:12:29 -0400
13
14 drivers/net/forcedeth.c | 17 ++++++++++++++++-
15 include/linux/pci_ids.h | 2 ++
16 2 files changed, 18 insertions(+), 1 deletions(-)
17
18 diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
19 --- a/drivers/net/forcedeth.c
20 +++ b/drivers/net/forcedeth.c
21 @@ -84,6 +84,7 @@
22 * 0.32: 16 Apr 2005: RX_ERROR4 handling added.
23 * 0.33: 16 May 2005: Support for MCP51 added.
24 * 0.34: 18 Jun 2005: Add DEV_NEED_LINKTIMER to all nForce nics.
25 + * 0.35: 26 Jun 2005: Support for MCP55 added.
26 *
27 * Known bugs:
28 * We suspect that on some hardware no TX done interrupts are generated.
29 @@ -95,7 +96,7 @@
30 * DEV_NEED_TIMERIRQ will not harm you on sane hardware, only generating a few
31 * superfluous timer interrupts from the nic.
32 */
33 -#define FORCEDETH_VERSION "0.34"
34 +#define FORCEDETH_VERSION "0.35"
35 #define DRV_NAME "forcedeth"
36
37 #include <linux/module.h>
38 @@ -2284,6 +2285,20 @@ static struct pci_device_id pci_tbl[] =
39 .subdevice = PCI_ANY_ID,
40 .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER,
41 },
42 + { /* MCP55 Ethernet Controller */
43 + .vendor = PCI_VENDOR_ID_NVIDIA,
44 + .device = PCI_DEVICE_ID_NVIDIA_NVENET_14,
45 + .subvendor = PCI_ANY_ID,
46 + .subdevice = PCI_ANY_ID,
47 + .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER,
48 + },
49 + { /* MCP55 Ethernet Controller */
50 + .vendor = PCI_VENDOR_ID_NVIDIA,
51 + .device = PCI_DEVICE_ID_NVIDIA_NVENET_15,
52 + .subvendor = PCI_ANY_ID,
53 + .subdevice = PCI_ANY_ID,
54 + .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER,
55 + },
56 {0,},
57 };
58
59 diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
60 --- a/include/linux/pci_ids.h
61 +++ b/include/linux/pci_ids.h
62 @@ -1284,6 +1284,8 @@
63 #define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5700_2 0x0348
64 #define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_GO1000 0x034C
65 #define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_1100 0x034E
66 +#define PCI_DEVICE_ID_NVIDIA_NVENET_14 0x0372
67 +#define PCI_DEVICE_ID_NVIDIA_NVENET_15 0x0373
68
69 #define PCI_VENDOR_ID_IMS 0x10e0
70 #define PCI_DEVICE_ID_IMS_8849 0x8849

  ViewVC Help
Powered by ViewVC 1.1.20