summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorAuke Kok <auke-jan.h.kok@intel.com>2006-06-27 18:06:24 +0200
committerAuke Kok <juke-jan.h.kok@intel.com>2006-06-27 18:06:24 +0200
commitacfbc9fde2ec7f304398f6ad7644002e07bf84bc (patch)
tree346a872fc0624dc2bdbef913cb882a8337c61abf /drivers/net
parentMerge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgar... (diff)
downloadlinux-acfbc9fde2ec7f304398f6ad7644002e07bf84bc.tar.xz
linux-acfbc9fde2ec7f304398f6ad7644002e07bf84bc.zip
e1000: fix loopback ethtool test
Ethtool was reporting that loopback failed randomly on esb2 systems. Upon study it was found that the phy manual was changed with respect to the loopback mode bits. The new value fixes it. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/e1000/e1000_ethtool.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 6ed7f599eba3..845d293b2f6a 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -1246,7 +1246,7 @@ e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
} else if (adapter->hw.phy_type == e1000_phy_gg82563) {
e1000_write_phy_reg(&adapter->hw,
GG82563_PHY_KMRN_MODE_CTRL,
- 0x1CE);
+ 0x1CC);
}
/* force 1000, set loopback */
e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x4140);