From 7d93fdf68bc2f267f464197f19758ebc1f5b6b00 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 30 Sep 2009 16:42:42 -0700
Subject: [PATCH] --- yaml --- r: 166632 b: refs/heads/master c:
 81bbb3d4048cf577b5babcb0834230de391a35c5 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e7b58ac1565d..c47d19317ba5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 013820a360b63a0a18fa13afb858b9f1af7e64fe
+refs/heads/master: 81bbb3d4048cf577b5babcb0834230de391a35c5
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 560c8c9c03ab..b8f74cfb1bfd 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -2288,6 +2288,9 @@ int netif_receive_skb(struct sk_buff *skb)
 	int ret = NET_RX_DROP;
 	__be16 type;
 
+	if (!skb->tstamp.tv64)
+		net_timestamp(skb);
+
 	if (skb->vlan_tci && vlan_hwaccel_do_receive(skb))
 		return NET_RX_SUCCESS;
 
@@ -2295,9 +2298,6 @@ int netif_receive_skb(struct sk_buff *skb)
 	if (netpoll_receive_skb(skb))
 		return NET_RX_DROP;
 
-	if (!skb->tstamp.tv64)
-		net_timestamp(skb);
-
 	if (!skb->iif)
 		skb->iif = skb->dev->ifindex;