Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/message/fusion/mptlan.c
	drivers/net/sfc/ethtool.c
	net/mac80211/debugfs_sta.c

1 files changed, 1 insertions, 1 deletions

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index f24a4951008b..267185a848f6 100644
--- a/net/core/skbuff.c
+++ b/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;
 }