diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2006-01-12 19:51:21 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 07:48:04 -0500 |
commit | b7ee49db8b4b21dad3284d5507e7ea2946031f6e (patch) | |
tree | 1608149c1afea7bb19888664f89d18c14e0d1e88 /drivers/net/e1000/e1000_ethtool.c | |
parent | 72d64a436724da72f876c85a73895a622da6a673 (diff) |
[PATCH] e1000: Added hardware support for PCI express, 82546GB, and 82571 Fiber
Added 82571 fiber to WOL fix for dual port adapters.
Added support for 82546GB (Quad Copper).
Added PCIe typedef for x2, igp cable length 115, and extended TX CTRL registers.
Added parity error detection and PCIe CTRL registers.
Added EEPROM config registers.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/e1000/e1000_ethtool.c')
-rw-r--r-- | drivers/net/e1000/e1000_ethtool.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c index 8363d8d86318..0f9c86057a58 100644 --- a/drivers/net/e1000/e1000_ethtool.c +++ b/drivers/net/e1000/e1000_ethtool.c | |||
@@ -1628,6 +1628,7 @@ e1000_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) | |||
1628 | 1628 | ||
1629 | case E1000_DEV_ID_82546EB_FIBER: | 1629 | case E1000_DEV_ID_82546EB_FIBER: |
1630 | case E1000_DEV_ID_82546GB_FIBER: | 1630 | case E1000_DEV_ID_82546GB_FIBER: |
1631 | case E1000_DEV_ID_82571EB_FIBER: | ||
1631 | /* Wake events only supported on port A for dual fiber */ | 1632 | /* Wake events only supported on port A for dual fiber */ |
1632 | if(E1000_READ_REG(hw, STATUS) & E1000_STATUS_FUNC_1) { | 1633 | if(E1000_READ_REG(hw, STATUS) & E1000_STATUS_FUNC_1) { |
1633 | wol->supported = 0; | 1634 | wol->supported = 0; |
@@ -1671,6 +1672,7 @@ e1000_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) | |||
1671 | 1672 | ||
1672 | case E1000_DEV_ID_82546EB_FIBER: | 1673 | case E1000_DEV_ID_82546EB_FIBER: |
1673 | case E1000_DEV_ID_82546GB_FIBER: | 1674 | case E1000_DEV_ID_82546GB_FIBER: |
1675 | case E1000_DEV_ID_82571EB_FIBER: | ||
1674 | /* Wake events only supported on port A for dual fiber */ | 1676 | /* Wake events only supported on port A for dual fiber */ |
1675 | if(E1000_READ_REG(hw, STATUS) & E1000_STATUS_FUNC_1) | 1677 | if(E1000_READ_REG(hw, STATUS) & E1000_STATUS_FUNC_1) |
1676 | return wol->wolopts ? -EOPNOTSUPP : 0; | 1678 | return wol->wolopts ? -EOPNOTSUPP : 0; |