From 22bb07cef0ebc7b0670a61d6d4a55b06922129c8 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 20 Apr 2010 20:08:36 +0000
Subject: [PATCH] --- yaml --- r: 194317 b: refs/heads/master c:
 9a20e3197e7f6097897c6d1f18335a326ee06299 h: refs/heads/master i:   194315:
 3477fccd26a7cf33e8957ce4f7d137281baf819f v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index beaf043a98c5..9cc492488942 100644
--- 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
index e904c476b112..9bf1cccb067e 100644
--- 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)