From 03eba02accab0afb1db3c3fd04d0c16b0715e4be Mon Sep 17 00:00:00 2001
From: Alexander Duyck <alexander.h.duyck@intel.com>
Date: Mon, 2 Mar 2009 16:01:53 -0800
Subject: [PATCH] --- yaml --- r: 135007 b: refs/heads/master c:
 19147bb5f1f7e7ee79f0c92f59f67da8c0031dc0 h: refs/heads/master i:   135005:
 d3a02a846ea5bd797d1c3ee7c3147e06055b3a06   135003:
 06e051a6c908b27392512542628c5b1475b78e6e   134999:
 e0bad8a1c8d8c50f88f399cd24fbb2f11c0079b4   134991:
 f8a695160784d6059e57b2ebe387fc74f48a3b3a   134975:
 6f11aec96fc0814c5f49681042a5e1f93c2155cb v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/net/igb/igb_main.c | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index c405a330b8e5..2c984d0a56ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3a21be86c178964167aa54c39a01260d33e7509
+refs/heads/master: 19147bb5f1f7e7ee79f0c92f59f67da8c0031dc0
diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c
index 6cae258df96d..78558f840fd2 100644
--- a/trunk/drivers/net/igb/igb_main.c
+++ b/trunk/drivers/net/igb/igb_main.c
@@ -3258,14 +3258,6 @@ static int igb_xmit_frame_ring_adv(struct sk_buff *skb,
 	if (unlikely(shtx->hardware)) {
 		shtx->in_progress = 1;
 		tx_flags |= IGB_TX_FLAGS_TSTAMP;
-	} else if (likely(!shtx->software)) {
-		/*
-		 * TODO: can this be solved in dev.c:dev_hard_start_xmit()?
-		 * There are probably unmodified driver which do something
-		 * like this and thus don't work in combination with
-		 * SOF_TIMESTAMPING_TX_SOFTWARE.
-		 */
-		skb_orphan(skb);
 	}
 
 	if (adapter->vlgrp && vlan_tx_tag_present(skb)) {
@@ -4253,9 +4245,6 @@ static void igb_tx_hwtstamp(struct igb_adapter *adapter, struct sk_buff *skb)
 				timecompare_transform(&adapter->compare, ns);
 			skb_tstamp_tx(skb, &shhwtstamps);
 		}
-
-		/* delayed orphaning: skb_tstamp_tx() needs the socket */
-		skb_orphan(skb);
 	}
 }