summaryrefslogtreecommitdiffstats
path: root/drivers/net/igb
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2009-03-02 16:01:53 -0800
committerDavid S. Miller <davem@davemloft.net>2009-03-02 16:01:53 -0800
commit19147bb5f1f7e7ee79f0c92f59f67da8c0031dc0 (patch)
tree9021d5b9779a476edbb9dce5cbdb03ef6ab9029a /drivers/net/igb
parentd3a21be86c178964167aa54c39a01260d33e7509 (diff)
downloadlinux-19147bb5f1f7e7ee79f0c92f59f67da8c0031dc0.tar.bz2
igb: remove skb_orphan calls
Remove skb_orphan call from igb driver as it can cause multiple issues due to the fact that it is calling the desctructor and removing the skb from the socket prior to transmission. The call was added to improve performance but did so by allowing the skb to be removed from the socket which gave the socket more window space to transmit. The performance gain is not worth the extra problems that this kind of workaround can introduce as this could lead to a potential DoS if a UDP stream decided to monopolize the transmit path. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Acked-by: Mitch Williams <mitch.a.williams@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/igb')
-rw-r--r--drivers/net/igb/igb_main.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 6cae258df96d..78558f840fd2 100644
--- a/drivers/net/igb/igb_main.c
+++ b/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);
}
}