diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-22 01:02:07 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-22 01:02:07 -0700 |
| commit | 9ccb8975940c4ee51161152e37058e3d9e06c62f (patch) | |
| tree | 2893117519551b3f42944e066ab0aeb2c12b6aa7 /net/core | |
| parent | e326bed2f47d0365da5a8faaf8ee93ed2d86325b (diff) | |
| download | linux-9ccb8975940c4ee51161152e37058e3d9e06c62f.tar.gz linux-9ccb8975940c4ee51161152e37058e3d9e06c62f.tar.bz2 linux-9ccb8975940c4ee51161152e37058e3d9e06c62f.zip | |
net: Orphan and de-dst skbs earlier in xmit path.
This way GSO packets don't get handled differently.
With help from Eric Dumazet.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 3ba774b6091c..a4a7c36917d1 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1902,13 +1902,6 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev, if (!list_empty(&ptype_all)) dev_queue_xmit_nit(skb, dev); - if (netif_needs_gso(dev, skb)) { - if (unlikely(dev_gso_segment(skb))) - goto out_kfree_skb; - if (skb->next) - goto gso; - } - /* * If device doesnt need skb->dst, release it right now while * its hot in this cpu cache @@ -1917,6 +1910,14 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev, skb_dst_drop(skb); skb_orphan_try(skb); + + if (netif_needs_gso(dev, skb)) { + if (unlikely(dev_gso_segment(skb))) + goto out_kfree_skb; + if (skb->next) + goto gso; + } + rc = ops->ndo_start_xmit(skb, dev); if (rc == NETDEV_TX_OK) txq_trans_update(txq); |