forcedeth: mac address mcp77/79

This patch is a critical fix for MCP77 and MCP79 devices. The feature flags were missing the define for correct mac address (DEV_HAS_CORRECT_MACADDR). Signed-off-by: Ayaz Abdulla <aabdulla@nvidia.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: David S. Miller <davem@davemloft.net>
author: Ayaz Abdulla <aabdulla@nvidia.com> 2008-01-28 10:24:40 -0500
committer: David S. Miller <davem@davemloft.net> 2008-02-03 07:28:40 -0500
commit: 2b91213064bd882c3adf35f028c6d12fab3269ec (patch)
tree: 799e5ea0f04c3cb1d9aa2902c97b5296400a9d3c /drivers/net
parent: bb9a4fd1f7cc083f72e52f01938c23ac5b3403d5 (diff)
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 2034a7d09225..36342230a6de 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -5598,35 +5598,35 @@ static struct pci_device_id pci_tbl[] = {
        },
        {       /* MCP77 Ethernet Controller */
                PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_32),
-                .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,
+                .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|DEV_HAS_CORRECT_MACADDR,
        },
        {       /* MCP77 Ethernet Controller */
                PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_33),
-                .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,
+                .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|DEV_HAS_CORRECT_MACADDR,
        },
        {       /* MCP77 Ethernet Controller */
                PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_34),
-                .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,
+                .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|DEV_HAS_CORRECT_MACADDR,
        },
        {       /* MCP77 Ethernet Controller */
                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,
+                .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|DEV_HAS_CORRECT_MACADDR,
        },
        {       /* 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,
+                .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|DEV_HAS_CORRECT_MACADDR,
        },
        {       /* 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,
+                .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|DEV_HAS_CORRECT_MACADDR,
        },
        {       /* 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,
+                .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|DEV_HAS_CORRECT_MACADDR,
        },
        {       /* 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,
+                .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|DEV_HAS_CORRECT_MACADDR,
        },
        {0,},
 };
author	Ayaz Abdulla <aabdulla@nvidia.com>	2008-01-28 10:24:40 -0500
committer	David S. Miller <davem@davemloft.net>	2008-02-03 07:28:40 -0500
commit	2b91213064bd882c3adf35f028c6d12fab3269ec (patch)
tree	799e5ea0f04c3cb1d9aa2902c97b5296400a9d3c /drivers/net
parent	bb9a4fd1f7cc083f72e52f01938c23ac5b3403d5 (diff)

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 2034a7d09225..36342230a6de 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c
@@ -5598,35 +5598,35 @@ static struct pci_device_id pci_tbl[] = {
5598	},	5598	},
5599	{ /* MCP77 Ethernet Controller */	5599	{ /* MCP77 Ethernet Controller */
5600	PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_32),	5600	PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_32),
5601	.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,	5601	.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\|DEV_HAS_CORRECT_MACADDR,
5602	},	5602	},
5603	{ /* MCP77 Ethernet Controller */	5603	{ /* MCP77 Ethernet Controller */
5604	PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_33),	5604	PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_33),
5605	.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,	5605	.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\|DEV_HAS_CORRECT_MACADDR,
5606	},	5606	},
5607	{ /* MCP77 Ethernet Controller */	5607	{ /* MCP77 Ethernet Controller */
5608	PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_34),	5608	PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_34),
5609	.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,	5609	.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\|DEV_HAS_CORRECT_MACADDR,
5610	},	5610	},
5611	{ /* MCP77 Ethernet Controller */	5611	{ /* MCP77 Ethernet Controller */
5612	PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_35),	5612	PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_35),
5613	.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,	5613	.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\|DEV_HAS_CORRECT_MACADDR,
5614	},	5614	},
5615	{ /* MCP79 Ethernet Controller */	5615	{ /* MCP79 Ethernet Controller */
5616	PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_36),	5616	PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_36),
5617	.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,	5617	.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\|DEV_HAS_CORRECT_MACADDR,
5618	},	5618	},
5619	{ /* MCP79 Ethernet Controller */	5619	{ /* MCP79 Ethernet Controller */
5620	PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_37),	5620	PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_37),
5621	.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,	5621	.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\|DEV_HAS_CORRECT_MACADDR,
5622	},	5622	},
5623	{ /* MCP79 Ethernet Controller */	5623	{ /* MCP79 Ethernet Controller */
5624	PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_38),	5624	PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_38),
5625	.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,	5625	.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\|DEV_HAS_CORRECT_MACADDR,
5626	},	5626	},
5627	{ /* MCP79 Ethernet Controller */	5627	{ /* MCP79 Ethernet Controller */
5628	PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_39),	5628	PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_39),
5629	.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,	5629	.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\|DEV_HAS_CORRECT_MACADDR,
5630	},	5630	},
5631	{0,},	5631	{0,},
5632	};	5632	};