From a3332293ce6fc670b7aa61a3cfc883ac30e5c7fe Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Mon, 20 Dec 2010 21:22:51 +0000
Subject: [PATCH] --- yaml --- r: 225213 b: refs/heads/master c:
 70978182d431e0348e6ef711d0f962d12c03bc46 h: refs/heads/master i:   225211:
 3355d9a797adeb253b624a7bfdf0160304ef52f2 v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 83633eb18614..8c87970917c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 356f039822b8d802138f7121c80d2a9286976dbd
+refs/heads/master: 70978182d431e0348e6ef711d0f962d12c03bc46
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 59877290bca7..a215269d2e35 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -1547,13 +1547,6 @@ static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)
 	struct sk_buff *skb2 = NULL;
 	struct packet_type *pt_prev = NULL;
 
-#ifdef CONFIG_NET_CLS_ACT
-	if (!(skb->tstamp.tv64 && (G_TC_FROM(skb->tc_verd) & AT_INGRESS)))
-		net_timestamp_set(skb);
-#else
-	net_timestamp_set(skb);
-#endif
-
 	rcu_read_lock();
 	list_for_each_entry_rcu(ptype, &ptype_all, list) {
 		/* Never send packets back to the socket
@@ -1572,6 +1565,8 @@ static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)
 			if (!skb2)
 				break;
 
+			net_timestamp_set(skb2);
+
 			/* skb->nh should be correctly
 			   set by sender, so that the second statement is
 			   just protection against buggy protocols.