From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 13 Jan 2006 00:51:03 +0000 (-0800)
Subject: [PATCH] e1000: Fix bit 22 (TXDCTL) for 82571 & 82572 controllers
X-Git-Tag: v2.6.16-rc2~366^2~32
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=47028635d17c7b9c7ffc67499be5fed579bdfe72;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index 19a0b2a6ada..f79d2a06ee7 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;