Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4ec7f98 authored by Auke Kok's avatar Auke Kok Committed by Jeff Garzik
Browse files

e1000: Add device IDs of blade version of the 82571 quad port 



This blade-specific board form factor is identical to the 82571EB
board.

Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 88f5f0ca

drivers/net/e1000/e1000_ethtool.c

+1 −0
Original line number Diff line number Diff line
@@ -1726,6 +1726,7 @@ static int e1000_wol_exclusion(struct e1000_adapter *adapter, struct ethtool_wol 
	case E1000_DEV_ID_82571EB_QUAD_COPPER:

	case E1000_DEV_ID_82571EB_QUAD_FIBER:

	case E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE:

	case E1000_DEV_ID_82571PT_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
@@ -387,6 +387,7 @@ e1000_set_mac_type(struct e1000_hw *hw) 
	case E1000_DEV_ID_82571EB_SERDES_DUAL:

	case E1000_DEV_ID_82571EB_SERDES_QUAD:

	case E1000_DEV_ID_82571EB_QUAD_COPPER:

	case E1000_DEV_ID_82571PT_QUAD_COPPER:

	case E1000_DEV_ID_82571EB_QUAD_FIBER:

	case E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE:

		hw->mac_type = e1000_82571;

drivers/net/e1000/e1000_hw.h

+1 −0
Original line number Diff line number Diff line
@@ -475,6 +475,7 @@ int32_t e1000_check_phy_reset_block(struct e1000_hw *hw); 
#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_82571PT_QUAD_COPPER 0x10D5

#define E1000_DEV_ID_82571EB_QUAD_FIBER  0x10A5

#define E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE  0x10BC

#define E1000_DEV_ID_82571EB_SERDES_DUAL 0x10D9

drivers/net/e1000/e1000_main.c

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

	INTEL_E1000_ETHERNET_DEVICE(0x10C4),

	INTEL_E1000_ETHERNET_DEVICE(0x10C5),

	INTEL_E1000_ETHERNET_DEVICE(0x10D5),

	INTEL_E1000_ETHERNET_DEVICE(0x10D9),

	INTEL_E1000_ETHERNET_DEVICE(0x10DA),

	/* required last entry */
@@ -1101,6 +1102,7 @@ e1000_probe(struct pci_dev *pdev, 
	case E1000_DEV_ID_82571EB_QUAD_COPPER:

	case E1000_DEV_ID_82571EB_QUAD_FIBER:

	case E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE:

	case E1000_DEV_ID_82571PT_QUAD_COPPER:

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

		if (global_quad_port_a != 0)

			adapter->eeprom_wol = 0;