forcedeth: remove device id macros
Subsystems (2)
PATCH 1/3 forcedeth: remove device id macros
This patch removes the device id macros and instead uses the constants directly.
The areas in which logic expressions where using the macros now instead use feature/workaround flags.
No new functionality has been introduced in this patch, only clean up of flags and macros.
Signed-off-by Ayaz Abdulla <[email protected]>
drivers/net/forcedeth.c +98 -115
@@ -77,27 +77,31 @@* Hardware access: */ -#define DEV_NEED_TIMERIRQ 0x000001/* set the timer irq flag in the irq mask */ -#define DEV_NEED_LINKTIMER 0x000002/* poll link settings. Relies on the timer irq */ -#define DEV_HAS_LARGEDESC 0x000004/* device supports jumbo frames and needs packet format 2 */ -#define DEV_HAS_HIGH_DMA 0x000008/* device supports 64bit dma */ -#define DEV_HAS_CHECKSUM 0x000010/* device supports tx and rx checksum offloads */ -#define DEV_HAS_VLAN 0x000020/* device supports vlan tagging and striping */ -#define DEV_HAS_MSI 0x000040/* device supports MSI */ -#define DEV_HAS_MSI_X 0x000080/* device supports MSI-X */ -#define DEV_HAS_POWER_CNTRL 0x000100/* device supports power savings */ -#define DEV_HAS_STATISTICS_V1 0x000200/* device supports hw statistics version 1 */ -#define DEV_HAS_STATISTICS_V2 0x000600/* device supports hw statistics version 2 */ -#define DEV_HAS_STATISTICS_V3 0x000e00/* device supports hw statistics version 3 */ -#define DEV_HAS_TEST_EXTENDED 0x001000/* device supports extended diagnostic test */ -#define DEV_HAS_MGMT_UNIT 0x002000/* device supports management unit */ -#define DEV_HAS_CORRECT_MACADDR 0x004000/* device supports correct mac address order */ -#define DEV_HAS_COLLISION_FIX 0x008000/* device supports tx collision fix */ -#define DEV_HAS_PAUSEFRAME_TX_V1 0x010000/* device supports tx pause frames version 1 */ -#define DEV_HAS_PAUSEFRAME_TX_V2 0x020000/* device supports tx pause frames version 2 */ -#define DEV_HAS_PAUSEFRAME_TX_V3 0x040000/* device supports tx pause frames version 3 */ -#define DEV_NEED_TX_LIMIT 0x080000/* device needs to limit tx */ -#define DEV_HAS_GEAR_MODE 0x100000/* device supports gear mode */ +#define DEV_NEED_TIMERIRQ 0x0000001/* set the timer irq flag in the irq mask */ +#define DEV_NEED_LINKTIMER 0x0000002/* poll link settings. Relies on the timer irq */ +#define DEV_HAS_LARGEDESC 0x0000004/* device supports jumbo frames and needs packet format 2 */ +#define DEV_HAS_HIGH_DMA 0x0000008/* device supports 64bit dma */ +#define DEV_HAS_CHECKSUM 0x0000010/* device supports tx and rx checksum offloads */ +#define DEV_HAS_VLAN 0x0000020/* device supports vlan tagging and striping */ +#define DEV_HAS_MSI 0x0000040/* device supports MSI */ +#define DEV_HAS_MSI_X 0x0000080/* device supports MSI-X */ +#define DEV_HAS_POWER_CNTRL 0x0000100/* device supports power savings */ +#define DEV_HAS_STATISTICS_V1 0x0000200/* device supports hw statistics version 1 */ +#define DEV_HAS_STATISTICS_V2 0x0000600/* device supports hw statistics version 2 */ +#define DEV_HAS_STATISTICS_V3 0x0000e00/* device supports hw statistics version 3 */ +#define DEV_HAS_TEST_EXTENDED 0x0001000/* device supports extended diagnostic test */ +#define DEV_HAS_MGMT_UNIT 0x0002000/* device supports management unit */ +#define DEV_HAS_CORRECT_MACADDR 0x0004000/* device supports correct mac address order */ +#define DEV_HAS_COLLISION_FIX 0x0008000/* device supports tx collision fix */ +#define DEV_HAS_PAUSEFRAME_TX_V1 0x0010000/* device supports tx pause frames version 1 */ +#define DEV_HAS_PAUSEFRAME_TX_V2 0x0020000/* device supports tx pause frames version 2 */ +#define DEV_HAS_PAUSEFRAME_TX_V3 0x0040000/* device supports tx pause frames version 3 */ +#define DEV_NEED_TX_LIMIT 0x0080000/* device needs to limit tx */ +#define DEV_NEED_TX_LIMIT2 0x0180000/* device needs to limit tx, expect for some revs */ +#define DEV_HAS_GEAR_MODE 0x0200000/* device supports gear mode */ +#define DEV_NEED_PHY_INIT_FIX 0x0400000/* device needs specific phy workaround */ +#define DEV_NEED_LOW_POWER_FIX 0x0800000/* device needs special power up workaround */ +#define DEV_NEED_MSI_FIX 0x1000000/* device needs msi workaround */ enum { NvRegIrqStatus =0x000 ,
@@ -1271,14 +1275,7 @@ } }if (np->phy_model ==PHY_MODEL_REALTEK_8201 ) { -if (np->device_id ==PCI_DEVICE_ID_NVIDIA_NVENET_32 || - np->device_id ==PCI_DEVICE_ID_NVIDIA_NVENET_33 || - np->device_id ==PCI_DEVICE_ID_NVIDIA_NVENET_34 || - np->device_id ==PCI_DEVICE_ID_NVIDIA_NVENET_35 || - np->device_id ==PCI_DEVICE_ID_NVIDIA_NVENET_36 || - np->device_id ==PCI_DEVICE_ID_NVIDIA_NVENET_37 || - np->device_id ==PCI_DEVICE_ID_NVIDIA_NVENET_38 || - np->device_id ==PCI_DEVICE_ID_NVIDIA_NVENET_39 ) { +if (np->driver_data &DEV_NEED_PHY_INIT_FIX ) { phy_reserved =mii_rw (dev, np->phyaddr,PHY_REALTEK_INIT_REG6 ,MII_READ ); phy_reserved |=PHY_REALTEK_INIT7 ;if (mii_rw (dev, np->phyaddr,PHY_REALTEK_INIT_REG6 , phy_reserved)) {
@@ -1469,14 +1466,7 @@ } }if (np->phy_model ==PHY_MODEL_REALTEK_8201 ) { -if (np->device_id ==PCI_DEVICE_ID_NVIDIA_NVENET_32 || - np->device_id ==PCI_DEVICE_ID_NVIDIA_NVENET_33 || - np->device_id ==PCI_DEVICE_ID_NVIDIA_NVENET_34 || - np->device_id ==PCI_DEVICE_ID_NVIDIA_NVENET_35 || - np->device_id ==PCI_DEVICE_ID_NVIDIA_NVENET_36 || - np->device_id ==PCI_DEVICE_ID_NVIDIA_NVENET_37 || - np->device_id ==PCI_DEVICE_ID_NVIDIA_NVENET_38 || - np->device_id ==PCI_DEVICE_ID_NVIDIA_NVENET_39 ) { +if (np->driver_data &DEV_NEED_PHY_INIT_FIX ) { phy_reserved =mii_rw (dev, np->phyaddr,PHY_REALTEK_INIT_REG6 ,MII_READ ); phy_reserved |=PHY_REALTEK_INIT7 ;if (mii_rw (dev, np->phyaddr,PHY_REALTEK_INIT_REG6 , phy_reserved)) {
@@ -5844,8 +5834,7 @@/* take phy and nic out of low power mode */ powerstate =readl (base + NvRegPowerState2); powerstate &= ~NVREG_POWERSTATE2_POWERUP_MASK ; -if ((id->device ==PCI_DEVICE_ID_NVIDIA_NVENET_12 || - id->device ==PCI_DEVICE_ID_NVIDIA_NVENET_13 ) && +if ((id->driver_data &DEV_NEED_LOW_POWER_FIX ) && pci_dev->revision >=0xA3 ) powerstate |=NVREG_POWERSTATE2_POWERUP_REV_A3 ;writel (powerstate, base + NvRegPowerState2);
@@ -5901,14 +5890,7 @@/* Limit the number of tx's outstanding for hw bug */ if (id->driver_data &DEV_NEED_TX_LIMIT ) { np->tx_limit =1 ; -if ((id->device ==PCI_DEVICE_ID_NVIDIA_NVENET_32 || - id->device ==PCI_DEVICE_ID_NVIDIA_NVENET_33 || - id->device ==PCI_DEVICE_ID_NVIDIA_NVENET_34 || - id->device ==PCI_DEVICE_ID_NVIDIA_NVENET_35 || - id->device ==PCI_DEVICE_ID_NVIDIA_NVENET_36 || - id->device ==PCI_DEVICE_ID_NVIDIA_NVENET_37 || - id->device ==PCI_DEVICE_ID_NVIDIA_NVENET_38 || - id->device ==PCI_DEVICE_ID_NVIDIA_NVENET_39 ) && +if ((id->driver_data &DEV_NEED_TX_LIMIT2 ) && pci_dev->revision >=0xA2 ) np->tx_limit =0 ; }
@@ -6158,7 +6140,8 @@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->driver_data &DEV_NEED_MSI_FIX ) +pci_write_config_dword (pdev,NV_MSI_PRIV_OFFSET ,NV_MSI_PRIV_VALUE );/* restore phy state, including autoneg */ phy_init (dev);
@@ -6207,160 +6190,160 @@static struct pci_device_id pci_tbl[] = { {/* nForce Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_1 ), +PCI_DEVICE (0x10DE ,0x01C3 ), .driver_data =DEV_NEED_TIMERIRQ |DEV_NEED_LINKTIMER , }, {/* nForce2 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_2 ), +PCI_DEVICE (0x10DE ,0x0066 ), .driver_data =DEV_NEED_TIMERIRQ |DEV_NEED_LINKTIMER , }, {/* nForce3 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_3 ), +PCI_DEVICE (0x10DE ,0x00D6 ), .driver_data =DEV_NEED_TIMERIRQ |DEV_NEED_LINKTIMER , }, {/* nForce3 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_4 ), +PCI_DEVICE (0x10DE ,0x0086 ), .driver_data =DEV_NEED_TIMERIRQ |DEV_NEED_LINKTIMER |DEV_HAS_LARGEDESC |DEV_HAS_CHECKSUM , }, {/* nForce3 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_5 ), +PCI_DEVICE (0x10DE ,0x008C ), .driver_data =DEV_NEED_TIMERIRQ |DEV_NEED_LINKTIMER |DEV_HAS_LARGEDESC |DEV_HAS_CHECKSUM , }, {/* nForce3 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_6 ), +PCI_DEVICE (0x10DE ,0x00E6 ), .driver_data =DEV_NEED_TIMERIRQ |DEV_NEED_LINKTIMER |DEV_HAS_LARGEDESC |DEV_HAS_CHECKSUM , }, {/* nForce3 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_7 ), +PCI_DEVICE (0x10DE ,0x00DF ), .driver_data =DEV_NEED_TIMERIRQ |DEV_NEED_LINKTIMER |DEV_HAS_LARGEDESC |DEV_HAS_CHECKSUM , }, {/* CK804 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_8 ), +PCI_DEVICE (0x10DE ,0x0056 ), .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_LARGEDESC |DEV_HAS_CHECKSUM |DEV_HAS_HIGH_DMA |DEV_HAS_STATISTICS_V1 |DEV_NEED_TX_LIMIT , }, {/* CK804 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_9 ), +PCI_DEVICE (0x10DE ,0x0057 ), .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_LARGEDESC |DEV_HAS_CHECKSUM |DEV_HAS_HIGH_DMA |DEV_HAS_STATISTICS_V1 |DEV_NEED_TX_LIMIT , }, {/* MCP04 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_10 ), +PCI_DEVICE (0x10DE ,0x0037 ), .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_LARGEDESC |DEV_HAS_CHECKSUM |DEV_HAS_HIGH_DMA |DEV_HAS_STATISTICS_V1 |DEV_NEED_TX_LIMIT , }, {/* MCP04 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_11 ), +PCI_DEVICE (0x10DE ,0x0038 ), .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_LARGEDESC |DEV_HAS_CHECKSUM |DEV_HAS_HIGH_DMA |DEV_HAS_STATISTICS_V1 |DEV_NEED_TX_LIMIT , }, {/* MCP51 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_12 ), - .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_STATISTICS_V1 , +PCI_DEVICE (0x10DE ,0x0268 ), + .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_STATISTICS_V1 |DEV_NEED_LOW_POWER_FIX , }, {/* MCP51 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_13 ), - .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_STATISTICS_V1 , +PCI_DEVICE (0x10DE ,0x0269 ), + .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_STATISTICS_V1 |DEV_NEED_LOW_POWER_FIX , }, {/* MCP55 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_14 ), - .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_LARGEDESC |DEV_HAS_CHECKSUM |DEV_HAS_HIGH_DMA |DEV_HAS_VLAN |DEV_HAS_MSI |DEV_HAS_MSI_X |DEV_HAS_POWER_CNTRL |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_NEED_TX_LIMIT , +PCI_DEVICE (0x10DE ,0x0372 ), + .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_LARGEDESC |DEV_HAS_CHECKSUM |DEV_HAS_HIGH_DMA |DEV_HAS_VLAN |DEV_HAS_MSI |DEV_HAS_MSI_X |DEV_HAS_POWER_CNTRL |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_NEED_TX_LIMIT |DEV_NEED_MSI_FIX , }, {/* MCP55 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_15 ), - .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_LARGEDESC |DEV_HAS_CHECKSUM |DEV_HAS_HIGH_DMA |DEV_HAS_VLAN |DEV_HAS_MSI |DEV_HAS_MSI_X |DEV_HAS_POWER_CNTRL |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_NEED_TX_LIMIT , +PCI_DEVICE (0x10DE ,0x0373 ), + .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_LARGEDESC |DEV_HAS_CHECKSUM |DEV_HAS_HIGH_DMA |DEV_HAS_VLAN |DEV_HAS_MSI |DEV_HAS_MSI_X |DEV_HAS_POWER_CNTRL |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_NEED_TX_LIMIT |DEV_NEED_MSI_FIX , }, {/* MCP61 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_16 ), - .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR , +PCI_DEVICE (0x10DE ,0x03E5 ), + .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_NEED_MSI_FIX , }, {/* MCP61 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_17 ), - .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR , +PCI_DEVICE (0x10DE ,0x03E6 ), + .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_NEED_MSI_FIX , }, {/* MCP61 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_18 ), - .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR , +PCI_DEVICE (0x10DE ,0x03EE ), + .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_NEED_MSI_FIX , }, {/* MCP61 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_19 ), - .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR , +PCI_DEVICE (0x10DE ,0x03EF ), + .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_NEED_MSI_FIX , }, {/* MCP65 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_20 ), - .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_LARGEDESC |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_NEED_TX_LIMIT |DEV_NEED_TX_LIMIT |DEV_HAS_GEAR_MODE , +PCI_DEVICE (0x10DE ,0x0450 ), + .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_LARGEDESC |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_NEED_TX_LIMIT |DEV_HAS_GEAR_MODE |DEV_NEED_MSI_FIX , }, {/* MCP65 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_21 ), - .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_LARGEDESC |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_NEED_TX_LIMIT |DEV_HAS_GEAR_MODE , +PCI_DEVICE (0x10DE ,0x0451 ), + .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_LARGEDESC |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_NEED_TX_LIMIT |DEV_HAS_GEAR_MODE |DEV_NEED_MSI_FIX , }, {/* MCP65 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_22 ), - .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_LARGEDESC |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_NEED_TX_LIMIT |DEV_HAS_GEAR_MODE , +PCI_DEVICE (0x10DE ,0x0452 ), + .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_LARGEDESC |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_NEED_TX_LIMIT |DEV_HAS_GEAR_MODE |DEV_NEED_MSI_FIX , }, {/* MCP65 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_23 ), - .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_LARGEDESC |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_NEED_TX_LIMIT |DEV_HAS_GEAR_MODE , +PCI_DEVICE (0x10DE ,0x0453 ), + .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_LARGEDESC |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_NEED_TX_LIMIT |DEV_HAS_GEAR_MODE |DEV_NEED_MSI_FIX , }, {/* MCP67 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_24 ), - .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_HAS_GEAR_MODE , +PCI_DEVICE (0x10DE ,0x054C ), + .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_HAS_GEAR_MODE |DEV_NEED_MSI_FIX , }, {/* MCP67 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_25 ), - .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_HAS_GEAR_MODE , +PCI_DEVICE (0x10DE ,0x054D ), + .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_HAS_GEAR_MODE |DEV_NEED_MSI_FIX , }, {/* MCP67 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_26 ), - .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_HAS_GEAR_MODE , +PCI_DEVICE (0x10DE ,0x054E ), + .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_HAS_GEAR_MODE |DEV_NEED_MSI_FIX , }, {/* MCP67 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_27 ), - .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_HAS_GEAR_MODE , +PCI_DEVICE (0x10DE ,0x054F ), + .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_HAS_GEAR_MODE |DEV_NEED_MSI_FIX , }, {/* MCP73 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_28 ), - .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_HAS_COLLISION_FIX |DEV_HAS_GEAR_MODE , +PCI_DEVICE (0x10DE ,0x07DC ), + .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_HAS_COLLISION_FIX |DEV_HAS_GEAR_MODE |DEV_NEED_MSI_FIX , }, {/* MCP73 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_29 ), - .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_HAS_COLLISION_FIX |DEV_HAS_GEAR_MODE , +PCI_DEVICE (0x10DE ,0x07DD ), + .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_HAS_COLLISION_FIX |DEV_HAS_GEAR_MODE |DEV_NEED_MSI_FIX , }, {/* MCP73 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_30 ), - .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_HAS_COLLISION_FIX |DEV_HAS_GEAR_MODE , +PCI_DEVICE (0x10DE ,0x07DE ), + .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_HAS_COLLISION_FIX |DEV_HAS_GEAR_MODE |DEV_NEED_MSI_FIX , }, {/* MCP73 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_31 ), - .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_HAS_COLLISION_FIX |DEV_HAS_GEAR_MODE , +PCI_DEVICE (0x10DE ,0x07DF ), + .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_HIGH_DMA |DEV_HAS_POWER_CNTRL |DEV_HAS_MSI |DEV_HAS_PAUSEFRAME_TX_V1 |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_HAS_COLLISION_FIX |DEV_HAS_GEAR_MODE |DEV_NEED_MSI_FIX , }, {/* MCP77 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_32 ), - .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_CHECKSUM |DEV_HAS_HIGH_DMA |DEV_HAS_MSI |DEV_HAS_POWER_CNTRL |DEV_HAS_PAUSEFRAME_TX_V2 |DEV_HAS_STATISTICS_V3 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_HAS_COLLISION_FIX |DEV_NEED_TX_LIMIT |DEV_HAS_GEAR_MODE , +PCI_DEVICE (0x10DE ,0x0760 ), + .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_CHECKSUM |DEV_HAS_HIGH_DMA |DEV_HAS_MSI |DEV_HAS_POWER_CNTRL |DEV_HAS_PAUSEFRAME_TX_V2 |DEV_HAS_STATISTICS_V3 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_HAS_COLLISION_FIX |DEV_NEED_TX_LIMIT2 |DEV_HAS_GEAR_MODE |DEV_NEED_PHY_INIT_FIX |DEV_NEED_MSI_FIX , }, {/* MCP77 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_33 ), - .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_CHECKSUM |DEV_HAS_HIGH_DMA |DEV_HAS_MSI |DEV_HAS_POWER_CNTRL |DEV_HAS_PAUSEFRAME_TX_V2 |DEV_HAS_STATISTICS_V3 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_HAS_COLLISION_FIX |DEV_NEED_TX_LIMIT |DEV_HAS_GEAR_MODE , +PCI_DEVICE (0x10DE ,0x0761 ), + .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_CHECKSUM |DEV_HAS_HIGH_DMA |DEV_HAS_MSI |DEV_HAS_POWER_CNTRL |DEV_HAS_PAUSEFRAME_TX_V2 |DEV_HAS_STATISTICS_V3 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_HAS_COLLISION_FIX |DEV_NEED_TX_LIMIT2 |DEV_HAS_GEAR_MODE |DEV_NEED_PHY_INIT_FIX |DEV_NEED_MSI_FIX , }, {/* MCP77 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_34 ), - .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_CHECKSUM |DEV_HAS_HIGH_DMA |DEV_HAS_MSI |DEV_HAS_POWER_CNTRL |DEV_HAS_PAUSEFRAME_TX_V2 |DEV_HAS_STATISTICS_V3 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_HAS_COLLISION_FIX |DEV_NEED_TX_LIMIT |DEV_HAS_GEAR_MODE , +PCI_DEVICE (0x10DE ,0x0762 ), + .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_CHECKSUM |DEV_HAS_HIGH_DMA |DEV_HAS_MSI |DEV_HAS_POWER_CNTRL |DEV_HAS_PAUSEFRAME_TX_V2 |DEV_HAS_STATISTICS_V3 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_HAS_COLLISION_FIX |DEV_NEED_TX_LIMIT2 |DEV_HAS_GEAR_MODE |DEV_NEED_PHY_INIT_FIX |DEV_NEED_MSI_FIX , }, {/* MCP77 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_35 ), - .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_CHECKSUM |DEV_HAS_HIGH_DMA |DEV_HAS_MSI |DEV_HAS_POWER_CNTRL |DEV_HAS_PAUSEFRAME_TX_V2 |DEV_HAS_STATISTICS_V3 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_HAS_COLLISION_FIX |DEV_NEED_TX_LIMIT |DEV_HAS_GEAR_MODE , +PCI_DEVICE (0x10DE ,0x0763 ), + .driver_data =DEV_NEED_LINKTIMER |DEV_HAS_CHECKSUM |DEV_HAS_HIGH_DMA |DEV_HAS_MSI |DEV_HAS_POWER_CNTRL |DEV_HAS_PAUSEFRAME_TX_V2 |DEV_HAS_STATISTICS_V3 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT |DEV_HAS_CORRECT_MACADDR |DEV_HAS_COLLISION_FIX |DEV_NEED_TX_LIMIT2 |DEV_HAS_GEAR_MODE |DEV_NEED_PHY_INIT_FIX |DEV_NEED_MSI_FIX , }, {/* MCP79 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_36 ), - .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 , +PCI_DEVICE (0x10DE ,0x0AB0 ), + .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_LIMIT2 |DEV_HAS_GEAR_MODE |DEV_NEED_PHY_INIT_FIX |DEV_NEED_MSI_FIX , }, {/* MCP79 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_37 ), - .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 , +PCI_DEVICE (0x10DE ,0x0AB1 ), + .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_LIMIT2 |DEV_HAS_GEAR_MODE |DEV_NEED_PHY_INIT_FIX |DEV_NEED_MSI_FIX , }, {/* MCP79 Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_38 ), - .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 , +PCI_DEVICE (0x10DE ,0x0AB2 ), + .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_LIMIT2 |DEV_HAS_GEAR_MODE |DEV_NEED_PHY_INIT_FIX |DEV_NEED_MSI_FIX , }, {/* MCP79 Ethernet Controller */ -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 , +PCI_DEVICE (0x10DE ,0x0AB3 ), + .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_LIMIT2 |DEV_HAS_GEAR_MODE |DEV_NEED_PHY_INIT_FIX |DEV_NEED_MSI_FIX , }, {0 ,}, };
From: Ayaz Abdulla <[email protected]>
Date: Wed, 03 Jun 2009 21:05:17 -0400
Quoted 10 lines
This patch removes the device id macros and instead uses the constants directly.
The areas in which logic expressions where using the macros now instead use feature/workaround flags.
No new functionality has been introduced in this patch, only clean up of flags and macros.
Signed-off-by Ayaz Abdulla <[email protected]>
Applied to net-next-2.6
Hello,
Quoted 13 lines · Ayaz Abdulla
This patch removes the device id macros and instead uses the constants directly.
The areas in which logic expressions where using the macros now instead use feature/workaround flags.
No new functionality has been introduced in this patch, only clean up of flags and macros.
Signed-off-by Ayaz Abdulla <[email protected]>drivers/net/forcedeth.c +0
-0
[...]
drivers/net/forcedeth.c line 6147
Quoted 10 lines
drivers/net/forcedeth.c +2
-1@@ -6158,7 +6140,8 @@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->driver_data &DEV_NEED_MSI_FIX ) +pci_write_config_dword (pdev,NV_MSI_PRIV_OFFSET ,NV_MSI_PRIV_VALUE );/* restore phy state, including autoneg */ phy_init (dev);
This fragment actually changes logic despite patch description.
drivers/net/forcedeth.c line 6195
Quoted 8 lines
drivers/net/forcedeth.c +1
-1@@ -6207,160 +6190,160 @@static struct pci_device_id pci_tbl[] = { {/* nForce Ethernet Controller */ -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_1 ), +PCI_DEVICE (0x10DE ,0x01C3 ), .driver_data =DEV_NEED_TIMERIRQ |DEV_NEED_LINKTIMER , },
[cut]
The PCI device ID constants have probably no real meaning, but why also remove vendor ID constants?
Best Regards,
Michał Mirosław