summaryrefslogtreecommitdiff
path: root/drivers/net/e1000
diff options
context:
space:
mode:
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>2006-08-16 13:39:04 -0700
committerAuke Kok <juke-jan.h.kok@intel.com>2006-08-16 13:39:04 -0700
commit600c977c0801210602d7502f9c978c2b8c31a209 (patch)
treeff7a270e51012a4e10717e68ff9a0a2a7d57dd82 /drivers/net/e1000
parent7820d4281a0d746a92992a9117aec007628ae3fe (diff)
downloadlinux-next-600c977c0801210602d7502f9c978c2b8c31a209.tar.gz
e1000: Disable aggressive clocking on esb2 with SERDES port
Disable aggressive clocking on esb2 with SERDES port as it causes hardware problems. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r--drivers/net/e1000/e1000_main.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index b2caaa2117f2..978e3b722022 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -1498,8 +1498,6 @@ e1000_configure_tx(struct e1000_adapter *adapter)
} else if (hw->mac_type == e1000_80003es2lan) {
tarc = E1000_READ_REG(hw, TARC0);
tarc |= 1;
- if (hw->media_type == e1000_media_type_internal_serdes)
- tarc |= (1 << 20);
E1000_WRITE_REG(hw, TARC0, tarc);
tarc = E1000_READ_REG(hw, TARC1);
tarc |= 1;