---

yaml --- r: 194317 b: refs/heads/master c: 9a20e31 h: refs/heads/master i: 194315: 3477fcc v: v3
git-mirror · Apr 22, 2010 · 22bb07c · 22bb07c
1 parent 9740214
commit 22bb07c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7c561f2e32f98b477f5fe670b3f294be6b1eae2
+refs/heads/master: 9a20e3197e7f6097897c6d1f18335a326ee06299
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -1937,7 +1937,6 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
 		if (dev->priv_flags & IFF_XMIT_DST_RELEASE)
 			skb_dst_drop(nskb);
 
-		skb_orphan_try(nskb);
 		rc = ops->ndo_start_xmit(nskb, dev);
 		if (unlikely(rc != NETDEV_TX_OK)) {
 			if (rc & ~NETDEV_TX_MASK)