diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/e1000/e1000_ethtool.c | 1 | ||||
-rw-r--r-- | drivers/net/e1000/e1000_hw.c | 1 | ||||
-rw-r--r-- | drivers/net/e1000/e1000_hw.h | 1 | ||||
-rw-r--r-- | drivers/net/e1000/e1000_main.c | 2 |
4 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c index 04030729882b..3fccffdb27b5 100644 --- a/drivers/net/e1000/e1000_ethtool.c +++ b/drivers/net/e1000/e1000_ethtool.c | |||
@@ -1705,6 +1705,7 @@ static int e1000_wol_exclusion(struct e1000_adapter *adapter, struct ethtool_wol | |||
1705 | /* return success for non excluded adapter ports */ | 1705 | /* return success for non excluded adapter ports */ |
1706 | retval = 0; | 1706 | retval = 0; |
1707 | break; | 1707 | break; |
1708 | case E1000_DEV_ID_82571EB_QUAD_COPPER: | ||
1708 | case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3: | 1709 | case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3: |
1709 | /* quad port adapters only support WoL on port A */ | 1710 | /* quad port adapters only support WoL on port A */ |
1710 | if (!adapter->quad_port_a) { | 1711 | if (!adapter->quad_port_a) { |
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c index f56d4cd6701d..4b54c489f819 100644 --- a/drivers/net/e1000/e1000_hw.c +++ b/drivers/net/e1000/e1000_hw.c | |||
@@ -389,6 +389,7 @@ e1000_set_mac_type(struct e1000_hw *hw) | |||
389 | case E1000_DEV_ID_82571EB_COPPER: | 389 | case E1000_DEV_ID_82571EB_COPPER: |
390 | case E1000_DEV_ID_82571EB_FIBER: | 390 | case E1000_DEV_ID_82571EB_FIBER: |
391 | case E1000_DEV_ID_82571EB_SERDES: | 391 | case E1000_DEV_ID_82571EB_SERDES: |
392 | case E1000_DEV_ID_82571EB_QUAD_COPPER: | ||
392 | hw->mac_type = e1000_82571; | 393 | hw->mac_type = e1000_82571; |
393 | break; | 394 | break; |
394 | case E1000_DEV_ID_82572EI_COPPER: | 395 | case E1000_DEV_ID_82572EI_COPPER: |
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h index 4f74242746fa..a170e96251f6 100644 --- a/drivers/net/e1000/e1000_hw.h +++ b/drivers/net/e1000/e1000_hw.h | |||
@@ -470,6 +470,7 @@ int32_t e1000_check_phy_reset_block(struct e1000_hw *hw); | |||
470 | #define E1000_DEV_ID_82571EB_COPPER 0x105E | 470 | #define E1000_DEV_ID_82571EB_COPPER 0x105E |
471 | #define E1000_DEV_ID_82571EB_FIBER 0x105F | 471 | #define E1000_DEV_ID_82571EB_FIBER 0x105F |
472 | #define E1000_DEV_ID_82571EB_SERDES 0x1060 | 472 | #define E1000_DEV_ID_82571EB_SERDES 0x1060 |
473 | #define E1000_DEV_ID_82571EB_QUAD_COPPER 0x10A4 | ||
473 | #define E1000_DEV_ID_82572EI_COPPER 0x107D | 474 | #define E1000_DEV_ID_82572EI_COPPER 0x107D |
474 | #define E1000_DEV_ID_82572EI_FIBER 0x107E | 475 | #define E1000_DEV_ID_82572EI_FIBER 0x107E |
475 | #define E1000_DEV_ID_82572EI_SERDES 0x107F | 476 | #define E1000_DEV_ID_82572EI_SERDES 0x107F |
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 9071b78c77f9..3b61b9775e53 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -98,6 +98,7 @@ static struct pci_device_id e1000_pci_tbl[] = { | |||
98 | INTEL_E1000_ETHERNET_DEVICE(0x1098), | 98 | INTEL_E1000_ETHERNET_DEVICE(0x1098), |
99 | INTEL_E1000_ETHERNET_DEVICE(0x1099), | 99 | INTEL_E1000_ETHERNET_DEVICE(0x1099), |
100 | INTEL_E1000_ETHERNET_DEVICE(0x109A), | 100 | INTEL_E1000_ETHERNET_DEVICE(0x109A), |
101 | INTEL_E1000_ETHERNET_DEVICE(0x10A4), | ||
101 | INTEL_E1000_ETHERNET_DEVICE(0x10B5), | 102 | INTEL_E1000_ETHERNET_DEVICE(0x10B5), |
102 | INTEL_E1000_ETHERNET_DEVICE(0x10B9), | 103 | INTEL_E1000_ETHERNET_DEVICE(0x10B9), |
103 | INTEL_E1000_ETHERNET_DEVICE(0x10BA), | 104 | INTEL_E1000_ETHERNET_DEVICE(0x10BA), |
@@ -922,6 +923,7 @@ e1000_probe(struct pci_dev *pdev, | |||
922 | adapter->eeprom_wol = 0; | 923 | adapter->eeprom_wol = 0; |
923 | break; | 924 | break; |
924 | case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3: | 925 | case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3: |
926 | case E1000_DEV_ID_82571EB_QUAD_COPPER: | ||
925 | /* if quad port adapter, disable WoL on all but port A */ | 927 | /* if quad port adapter, disable WoL on all but port A */ |
926 | if (global_quad_port_a != 0) | 928 | if (global_quad_port_a != 0) |
927 | adapter->eeprom_wol = 0; | 929 | adapter->eeprom_wol = 0; |