From 08a6e4b93629ef4d9bd4337313aab5ae835f1272 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Tue, 7 Dec 2010 00:30:37 +0000 Subject: [PATCH] --- yaml --- r: 224823 b: refs/heads/master c: 15c2d75f49189e1769c5e8f5f099d03d055c4910 h: refs/heads/master i: 224821: 0d71742a768e646f2f52b714a723a7fe2d6e657f 224819: 6a461f522d843479302b2a9d4d3716ecce6c2485 224815: 48bb492d1fe743c0009e8b216551046911e88510 v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c703cba24e5f..c712df16e1f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62ab0812137ec4f9884dd7de346238841ac03283 +refs/heads/master: 15c2d75f49189e1769c5e8f5f099d03d055c4910 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 822b15b8d11c..d28b3a023bb2 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -2022,9 +2022,6 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev, int rc = NETDEV_TX_OK; if (likely(!skb->next)) { - if (!list_empty(&ptype_all)) - dev_queue_xmit_nit(skb, dev); - /* * If device doesnt need skb->dst, release it right now while * its hot in this cpu cache @@ -2032,6 +2029,9 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev, if (dev->priv_flags & IFF_XMIT_DST_RELEASE) skb_dst_drop(skb); + if (!list_empty(&ptype_all)) + dev_queue_xmit_nit(skb, dev); + skb_orphan_try(skb); if (vlan_tx_tag_present(skb) &&