From afba1af23b0e744a19a76c48da54ea7c3d56d9da Mon Sep 17 00:00:00 2001
From: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Date: Tue, 4 Oct 2005 07:04:22 -0400
Subject: [PATCH] --- yaml --- r: 10295 b: refs/heads/master c:
 2ae76d98fb9f0a9226dd62cf0a0b7547507d2862 h: refs/heads/master i:   10293:
 0e42851f053c5e4e9bb317cdff4f87eff8d715cd   10291:
 439f5fcfd64262aaa2412064d8d9d14a58c8b24b   10287:
 03bc5b1d9cf53738aba11a64be32d2a2320b78b1 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/net/e1000/e1000_main.c | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8a91e65990e6..986654ccd055 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24025e4ecf88743e1b3d46451b0e3f9de4bbcba5
+refs/heads/master: 2ae76d98fb9f0a9226dd62cf0a0b7547507d2862
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
index ce1044a80bd2..ad92115f20a0 100644
--- a/trunk/drivers/net/e1000/e1000_main.c
+++ b/trunk/drivers/net/e1000/e1000_main.c
@@ -1151,6 +1151,7 @@ e1000_setup_tx_resources(struct e1000_adapter *adapter,
 		return -ENOMEM;
 	}
 	memset(txdr->buffer_info, 0, size);
+	memset(&txdr->previous_buffer_info, 0, sizeof(struct e1000_buffer));
 
 	/* round up to nearest 4K */
 
@@ -1199,6 +1200,7 @@ e1000_setup_tx_resources(struct e1000_adapter *adapter,
 
 	txdr->next_to_use = 0;
 	txdr->next_to_clean = 0;
+	spin_lock_init(&txdr->tx_lock);
 
 	return 0;
 }
@@ -1312,6 +1314,19 @@ e1000_configure_tx(struct e1000_adapter *adapter)
 
 	E1000_WRITE_REG(hw, TCTL, tctl);
 
+	if (hw->mac_type == e1000_82571 || hw->mac_type == e1000_82572) {
+		tarc = E1000_READ_REG(hw, TARC0);
+		tarc |= ((1 << 25) | (1 << 21));
+		E1000_WRITE_REG(hw, TARC0, tarc);
+		tarc = E1000_READ_REG(hw, TARC1);
+		tarc |= (1 << 25);
+		if (tctl & E1000_TCTL_MULR)
+			tarc &= ~(1 << 28);
+		else
+			tarc |= (1 << 28);
+		E1000_WRITE_REG(hw, TARC1, tarc);
+	}
+
 	e1000_config_collision_dist(hw);
 
 	/* Setup Transmit Descriptor Settings for eop descriptor */
@@ -1601,6 +1616,14 @@ e1000_configure_rx(struct e1000_adapter *adapter)
 				1000000000 / (adapter->itr * 256));
 	}
 
+	if (hw->mac_type >= e1000_82571) {
+		/* Reset delay timers after every interrupt */
+		ctrl_ext = E1000_READ_REG(hw, CTRL_EXT);
+		ctrl_ext |= E1000_CTRL_EXT_CANC;
+		E1000_WRITE_REG(hw, CTRL_EXT, ctrl_ext);
+		E1000_WRITE_FLUSH(hw);
+	}
+
 	/* Setup the HW Rx Head and Tail Descriptor Pointers and
 	 * the Base and Length of the Rx Descriptor Ring */
 	switch (adapter->num_queues) {