| Message ID | 1291706359.2769.17.camel@edumazet-laptop |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Eric Dumazet <eric.dumazet@gmail.com> Date: Tue, 07 Dec 2010 08:19:19 +0100 > Avoid some atomic ops on dst refcount, calling dev_queue_xmit_nit() > after skb_dst_drop() in dev_hard_start_xmit(). > > Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Applied, thank you. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/core/dev.c b/net/core/dev.c index 55ff66f..59360ef 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2025,9 +2025,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 @@ -2037,6 +2034,9 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev, skb_orphan_try(skb); + if (!list_empty(&ptype_all)) + dev_queue_xmit_nit(skb, dev); + if (vlan_tx_tag_present(skb) && !(dev->features & NETIF_F_HW_VLAN_TX)) { skb = __vlan_put_tag(skb, vlan_tx_tag_get(skb));
Avoid some atomic ops on dst refcount, calling dev_queue_xmit_nit() after skb_dst_drop() in dev_hard_start_xmit(). Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> --- Next patch will perform the sk_run_filter() in dev_queue_xmit_nit(), before cloning skb and af_packet rcv() call. net/core/dev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html