From ed15345a64102bf84cb1cad2f9871eab90c12371 Mon Sep 17 00:00:00 2001
From: Ben Greear <greearb@candelatech.com>
Date: Tue, 21 Jul 2009 12:50:02 -0700
Subject: [PATCH] --- yaml --- r: 159027 b: refs/heads/master c:
 27a242e92f77c955433ce0347533f401ecdcd0f3 h: refs/heads/master i:   159025:
 893f7c0ad842501bf62917a6647950be50fb151f   159023:
 bb53181f97ce0a2aa2e6e9e8eb89ba61355f4a42 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/veth.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4af54268b200..9f9c5fca4a1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd52856ba24ed2f67679c86f207e5a9bab1eb93b
+refs/heads/master: 27a242e92f77c955433ce0347533f401ecdcd0f3
diff --git a/trunk/drivers/net/veth.c b/trunk/drivers/net/veth.c
index f1d753daa5bd..190f784c9cfe 100644
--- a/trunk/drivers/net/veth.c
+++ b/trunk/drivers/net/veth.c
@@ -171,6 +171,7 @@ static int veth_xmit(struct sk_buff *skb, struct net_device *dev)
 	if (skb->len > (rcv->mtu + MTU_PAD))
 		goto rx_drop;
 
+        skb->tstamp.tv64 = 0;
 	skb->pkt_type = PACKET_HOST;
 	skb->protocol = eth_type_trans(skb, rcv);
 	if (dev->features & NETIF_F_NO_CSUM)