---

yaml --- r: 166632 b: refs/heads/master c: 81bbb3d h: refs/heads/master v: v3
git-mirror · Sep 30, 2009 · 7d93fdf · 7d93fdf
1 parent dfd5fd6
commit 7d93fdf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -2288,16 +2288,16 @@ 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;
 
 	/* if we've gotten here through NAPI, check netpoll */
 	if (netpoll_receive_skb(skb))
 		return NET_RX_DROP;
 
-	if (!skb->tstamp.tv64)
-		net_timestamp(skb);
-
 	if (!skb->iif)
 		skb->iif = skb->dev->ifindex;