From 1cee8f0e20ec2c3225e3c95a810ef3c8b1c06131 Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Wed, 6 May 2009 16:49:18 -0700
Subject: [PATCH] --- yaml --- r: 144768 b: refs/heads/master c:
 b805007545813d276c844f0f6d6c825b07c6aec6 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 21ec50d9d209..9ca2bc2ec33b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 581daf7e00c5e766f26aff80a61a860a17b0d75a
+refs/heads/master: b805007545813d276c844f0f6d6c825b07c6aec6
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
index f091a5a845c1..d152394b2611 100644
--- a/trunk/net/core/skbuff.c
+++ b/trunk/net/core/skbuff.c
@@ -502,7 +502,9 @@ int skb_recycle_check(struct sk_buff *skb, int skb_size)
 	shinfo->gso_segs = 0;
 	shinfo->gso_type = 0;
 	shinfo->ip6_frag_id = 0;
+	shinfo->tx_flags.flags = 0;
 	shinfo->frag_list = NULL;
+	memset(&shinfo->hwtstamps, 0, sizeof(shinfo->hwtstamps));
 
 	memset(skb, 0, offsetof(struct sk_buff, tail));
 	skb->data = skb->head + NET_SKB_PAD;