From 9f2afc0ff6d3a5b58dc7c45a34ea54b25b401974 Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@marvell.com>
Date: Mon, 10 Nov 2008 21:45:05 -0800
Subject: [PATCH] --- yaml --- r: 118661 b: refs/heads/master c:
 5cd33db2120b5ce972568711156f91da83bff2d7 h: refs/heads/master i:   118659:
 68c9467b02887d498ebce45235352e1c70ecdca7 v: v3

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

diff --git a/[refs] b/[refs]
index 4bb3127dfa57..a879ec17a681 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b971e7ac834e9f4bda96d5a96ae9abccd01c1dd8
+refs/heads/master: 5cd33db2120b5ce972568711156f91da83bff2d7
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
index ebb6b94f8af2..d49ef8301b5b 100644
--- a/trunk/net/core/skbuff.c
+++ b/trunk/net/core/skbuff.c
@@ -486,8 +486,8 @@ int skb_recycle_check(struct sk_buff *skb, int skb_size)
 	shinfo->frag_list = NULL;
 
 	memset(skb, 0, offsetof(struct sk_buff, tail));
-	skb_reset_tail_pointer(skb);
 	skb->data = skb->head + NET_SKB_PAD;
+	skb_reset_tail_pointer(skb);
 
 	return 1;
 }