---

yaml --- r: 284333 b: refs/heads/master c: db83d13 h: refs/heads/master i: 284331: 0ea3186 v: v3
git-mirror · Jan 12, 2012 · fc36d36 · fc36d36
1 parent d7e95c2
commit fc36d36
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;
 	}