summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>2006-01-12 16:51:03 -0800
committerJeff Garzik <jgarzik@pobox.com>2006-01-17 07:44:51 -0500
commit47028635d17c7b9c7ffc67499be5fed579bdfe72 (patch)
tree0ac186eda8ed3530f05af8323b06190b1bccf1a8
parentf5645110aa2ed2dcc3e0373821474506ed4dc512 (diff)
downloadlinux-47028635d17c7b9c7ffc67499be5fed579bdfe72.tar.bz2
[PATCH] e1000: Fix bit 22 (TXDCTL) for 82571 & 82572 controllers
Removed duplicate code, TXDCTL and TXDCTL_COUNT_DESC are the same bit and there is no need to set it twice. 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>
-rw-r--r--drivers/net/e1000/e1000_hw.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index 19a0b2a6ada1..f79d2a06ee7f 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -735,7 +735,6 @@ e1000_init_hw(struct e1000_hw *hw)
break;
case e1000_82571:
case e1000_82572:
- ctrl |= (1 << 22);
case e1000_82573:
ctrl |= E1000_TXDCTL_COUNT_DESC;
break;