Commit 5881cde8 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Auke Kok
Browse files

e1000: Add PCI ID 0x10a4 for our new 4-port PCI-Express device 



Device 0x10a4 is a double 82571 on a single PCI-Express card and
has 4 gigabit capable ports.

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
parent 120cd576

drivers/net/e1000/e1000_ethtool.c

+1 −0
Original line number Diff line number Diff line
@@ -1705,6 +1705,7 @@ static int e1000_wol_exclusion(struct e1000_adapter *adapter, struct ethtool_wol 
		/* return success for non excluded adapter ports */

		retval = 0;

		break;

	case E1000_DEV_ID_82571EB_QUAD_COPPER:

	case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:

		/* quad port adapters only support WoL on port A */

		if (!adapter->quad_port_a) {

drivers/net/e1000/e1000_hw.c

+1 −0
Original line number Diff line number Diff line
@@ -389,6 +389,7 @@ e1000_set_mac_type(struct e1000_hw *hw) 
    case E1000_DEV_ID_82571EB_COPPER:

    case E1000_DEV_ID_82571EB_FIBER:

    case E1000_DEV_ID_82571EB_SERDES:

    case E1000_DEV_ID_82571EB_QUAD_COPPER:

            hw->mac_type = e1000_82571;

        break;

    case E1000_DEV_ID_82572EI_COPPER:

drivers/net/e1000/e1000_hw.h

+1 −0
Original line number Diff line number Diff line
@@ -470,6 +470,7 @@ int32_t e1000_check_phy_reset_block(struct e1000_hw *hw); 
#define E1000_DEV_ID_82571EB_COPPER      0x105E

#define E1000_DEV_ID_82571EB_FIBER       0x105F

#define E1000_DEV_ID_82571EB_SERDES      0x1060

#define E1000_DEV_ID_82571EB_QUAD_COPPER 0x10A4

#define E1000_DEV_ID_82572EI_COPPER      0x107D

#define E1000_DEV_ID_82572EI_FIBER       0x107E

#define E1000_DEV_ID_82572EI_SERDES      0x107F

drivers/net/e1000/e1000_main.c

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ static struct pci_device_id e1000_pci_tbl[] = { 
	INTEL_E1000_ETHERNET_DEVICE(0x1098),

	INTEL_E1000_ETHERNET_DEVICE(0x1099),

	INTEL_E1000_ETHERNET_DEVICE(0x109A),

	INTEL_E1000_ETHERNET_DEVICE(0x10A4),

	INTEL_E1000_ETHERNET_DEVICE(0x10B5),

	INTEL_E1000_ETHERNET_DEVICE(0x10B9),

	INTEL_E1000_ETHERNET_DEVICE(0x10BA),
@@ -922,6 +923,7 @@ e1000_probe(struct pci_dev *pdev, 
			adapter->eeprom_wol = 0;

		break;

	case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:

	case E1000_DEV_ID_82571EB_QUAD_COPPER:

		/* if quad port adapter, disable WoL on all but port A */

		if (global_quad_port_a != 0)

			adapter->eeprom_wol = 0;