| From 490dde8990c55662596a4be71b5070bd7d382d4a Mon Sep 17 00:00:00 2001 |
| From: Ayaz Abdulla <aabdulla@nvidia.com> |
| Date: Fri, 23 Nov 2007 20:54:01 -0500 |
| Subject: forcedeth: new mcp79 pci ids |
| |
| From: Ayaz Abdulla <aabdulla@nvidia.com> |
| |
| patch 490dde8990c55662596a4be71b5070bd7d382d4a in mainline. |
| |
| This patch adds new device ids and features for mcp79 devices into the |
| forcedeth driver. |
| |
| Signed-off-by: Ayaz Abdulla <aabdulla@nvidia.com> |
| Signed-off-by: Jeff Garzik <jgarzik@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| index 92ce2e3..f9ba0ac 100644 |
| --- |
| drivers/net/forcedeth.c | 16 ++++++++++++++++ |
| include/linux/pci_ids.h | 4 ++++ |
| 2 files changed, 20 insertions(+) |
| |
| --- a/drivers/net/forcedeth.c |
| +++ b/drivers/net/forcedeth.c |
| @@ -5582,6 +5582,22 @@ static struct pci_device_id pci_tbl[] = |
| PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_35), |
| .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT, |
| }, |
| + { /* MCP79 Ethernet Controller */ |
| + PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_36), |
| + .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT, |
| + }, |
| + { /* MCP79 Ethernet Controller */ |
| + PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_37), |
| + .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT, |
| + }, |
| + { /* MCP79 Ethernet Controller */ |
| + PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_38), |
| + .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT, |
| + }, |
| + { /* MCP79 Ethernet Controller */ |
| + PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_39), |
| + .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT, |
| + }, |
| {0,}, |
| }; |
| |
| --- a/include/linux/pci_ids.h |
| +++ b/include/linux/pci_ids.h |
| @@ -1237,6 +1237,10 @@ |
| #define PCI_DEVICE_ID_NVIDIA_NVENET_33 0x0761 |
| #define PCI_DEVICE_ID_NVIDIA_NVENET_34 0x0762 |
| #define PCI_DEVICE_ID_NVIDIA_NVENET_35 0x0763 |
| +#define PCI_DEVICE_ID_NVIDIA_NVENET_36 0x0AB0 |
| +#define PCI_DEVICE_ID_NVIDIA_NVENET_37 0x0AB1 |
| +#define PCI_DEVICE_ID_NVIDIA_NVENET_38 0x0AB2 |
| +#define PCI_DEVICE_ID_NVIDIA_NVENET_39 0x0AB3 |
| |
| #define PCI_VENDOR_ID_IMS 0x10e0 |
| #define PCI_DEVICE_ID_IMS_TT128 0x9128 |