From fc36d362f3f07bf9212cb49f1c8edb64f45ecb4b Mon Sep 17 00:00:00 2001
From: Manfred Rudigier <Manfred.Rudigier@omicron.at>
Date: Mon, 9 Jan 2012 23:26:50 +0000
Subject: [PATCH] --- yaml --- r: 284333 b: refs/heads/master c:
 db83d136d7f7534857cd9c6e588adc08a428b190 h: refs/heads/master i:   284331:
 0ea31861fcfa867f6ef2ef1cec9512556b6db9f8 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/net/ethernet/freescale/gianfar.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cc963a9e0e9d..4e37be5ed7aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb8a54a78e974e1af3e17fa38bb74d3747c5c1bd
+refs/heads/master: db83d136d7f7534857cd9c6e588adc08a428b190
diff --git a/trunk/drivers/net/ethernet/freescale/gianfar.c b/trunk/drivers/net/ethernet/freescale/gianfar.c
index e01cdaa722a9..2b3c12992127 100644
--- a/trunk/drivers/net/ethernet/freescale/gianfar.c
+++ b/trunk/drivers/net/ethernet/freescale/gianfar.c
@@ -2086,6 +2086,10 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
 			kfree_skb(skb);
 			return NETDEV_TX_OK;
 		}
+
+		/* Steal sock reference for processing TX time stamps */
+		swap(skb_new->sk, skb->sk);
+		swap(skb_new->destructor, skb->destructor);
 		kfree_skb(skb);
 		skb = skb_new;
 	}