From 8f3f849a79161437cb78bde9063e5bfa61da6e90 Mon Sep 17 00:00:00 2001
From: Alexander Duyck <alexander.h.duyck@intel.com>
Date: Tue, 16 Nov 2010 19:26:46 -0800
Subject: [PATCH] --- yaml --- r: 224359 b: refs/heads/master c:
 4c0ec6544a0cd5e3eed08df2c14cf98185098abe h: refs/heads/master i:   224357:
 6649b99c7389a1e9f6b03bb2c103ee543dd7cd9b   224355:
 0fa2298ed083c9e05fcff2c683c08c910320eb6d   224351:
 2d7464d94b8e605a99ce0798c40e7d758b371566 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/net/ixgbe/ixgbe_ethtool.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 4213d9430a9c..ef079414c3b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80ab193dce048e7b7afa43c99e69f508167e29ab
+refs/heads/master: 4c0ec6544a0cd5e3eed08df2c14cf98185098abe
diff --git a/trunk/drivers/net/ixgbe/ixgbe_ethtool.c b/trunk/drivers/net/ixgbe/ixgbe_ethtool.c
index 3dc731c22ff2..81fa1ac1c9ba 100644
--- a/trunk/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/trunk/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -412,11 +412,6 @@ static int ixgbe_set_rx_csum(struct net_device *netdev, u32 data)
 	else
 		adapter->flags &= ~IXGBE_FLAG_RX_CSUM_ENABLED;
 
-	if (netif_running(netdev))
-		ixgbe_reinit_locked(adapter);
-	else
-		ixgbe_reset(adapter);
-
 	return 0;
 }