The patch titled
forcedeth: add new device id
has been removed from the -mm tree. Its filename was
forcedeth-addition-of-new-device-id.patch
This patch was dropped because an updated version will be merged
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: forcedeth: add new device id
From: Ayaz Abdulla <aabdulla@xxxxxxxxxx>
Add support for new ethernet device in the MCP89 chipset.
Signed-off-by: Ayaz Abdulla <aabdulla@xxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/forcedeth.c | 7 ++++++-
include/linux/pci_ids.h | 1 +
2 files changed, 7 insertions(+), 1 deletion(-)
diff -puN drivers/net/forcedeth.c~forcedeth-addition-of-new-device-id drivers/net/forcedeth.c
--- a/drivers/net/forcedeth.c~forcedeth-addition-of-new-device-id
+++ a/drivers/net/forcedeth.c
@@ -6158,7 +6158,8 @@ static int nv_resume(struct pci_dev *pde
for (i = 0;i <= np->register_size/sizeof(u32); i++)
writel(np->saved_config_space[i], base+i*sizeof(u32));
- pci_write_config_dword(pdev, NV_MSI_PRIV_OFFSET, NV_MSI_PRIV_VALUE);
+ if (np->device_id != PCI_DEVICE_ID_NVIDIA_NVENET_40)
+ pci_write_config_dword(pdev, NV_MSI_PRIV_OFFSET, NV_MSI_PRIV_VALUE);
/* restore phy state, including autoneg */
phy_init(dev);
@@ -6362,6 +6363,10 @@ static struct pci_device_id pci_tbl[] =
PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_39),
.driver_data = DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V3|DEV_HAS_TEST_EXTENDED|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE,
},
+ { /* MCP89 Ethernet Controller */
+ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_40),
+ .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V3|DEV_HAS_TEST_EXTENDED|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE,
+ },
{0,},
};
diff -puN include/linux/pci_ids.h~forcedeth-addition-of-new-device-id include/linux/pci_ids.h
--- a/include/linux/pci_ids.h~forcedeth-addition-of-new-device-id
+++ a/include/linux/pci_ids.h
@@ -1289,6 +1289,7 @@
#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_DEVICE_ID_NVIDIA_NVENET_40 0x0D7D
#define PCI_VENDOR_ID_IMS 0x10e0
#define PCI_DEVICE_ID_IMS_TT128 0x9128
_
Patches currently in -mm which might be from aabdulla@xxxxxxxxxx are
linux-next.patch
forcedeth-addition-of-new-device-id.patch
forcedeth-fix-mac-address-detection-on-network-card-regression-in-2623.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
