From faa570a0e214973390acabdd6412ab7aa634d610 Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Sat, 21 Feb 2009 02:42:18 -0800
Subject: [PATCH] --- yaml --- r: 134646 b: refs/heads/master c:
 cd4d8fdad1f13205c769266dfa99015e226b6e07 h: refs/heads/master v: v3

---
 [refs]               |  2 +-
 trunk/net/core/dev.c | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index d14f66733363..d1092c3992a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be0c22a46cfb79ab2342bb28fde99afa94ef868e
+refs/heads/master: cd4d8fdad1f13205c769266dfa99015e226b6e07
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 5493394118fb..88dc082b47d1 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -1672,16 +1672,6 @@ static int dev_gso_segment(struct sk_buff *skb)
 	return 0;
 }
 
-static void tstamp_tx(struct sk_buff *skb)
-{
-	union skb_shared_tx *shtx =
-		skb_tx(skb);
-	if (unlikely(shtx->software &&
-			!shtx->in_progress)) {
-		skb_tstamp_tx(skb, NULL);
-	}
-}
-
 int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
 			struct netdev_queue *txq)
 {
@@ -1715,8 +1705,6 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
 		 * the skb destructor before the call and restoring it
 		 * afterwards, then doing the skb_orphan() ourselves?
 		 */
-		if (likely(!rc))
-			tstamp_tx(skb);
 		return rc;
 	}
 
@@ -1732,7 +1720,6 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
 			skb->next = nskb;
 			return rc;
 		}
-		tstamp_tx(skb);
 		if (unlikely(netif_tx_queue_stopped(txq) && skb->next))
 			return NETDEV_TX_BUSY;
 	} while (skb->next);