| Message ID | 1335553447-11964-3-git-send-email-willemb@google.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, 2012-04-27 at 15:04 -0400, Willem de Bruijn wrote: > Signed-off-by: Willem de Bruijn <willemb@google.com> > --- > drivers/net/ethernet/intel/e1000e/netdev.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c > index 851f793..c5d9ad7 100644 > --- a/drivers/net/ethernet/intel/e1000e/netdev.c > +++ b/drivers/net/ethernet/intel/e1000e/netdev.c > @@ -5150,6 +5150,8 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, > /* if count is 0 then mapping error has occurred */ > count = e1000_tx_map(tx_ring, skb, first, max_per_txd, nr_frags, mss); > if (count) { > + skb_tx_timestamp(skb); > + > netdev_sent_queue(netdev, skb->len); > e1000_tx_queue(tx_ring, tx_flags, count); > /* Make sure there is space in the ring for the next send. */ Acked-by: Eric Dumazet <edumazet@google.com> -- 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
From: Eric Dumazet <eric.dumazet@gmail.com> Date: Sat, 28 Apr 2012 09:47:53 +0200 > On Fri, 2012-04-27 at 15:04 -0400, Willem de Bruijn wrote: >> Signed-off-by: Willem de Bruijn <willemb@google.com> ... > Acked-by: Eric Dumazet <edumazet@google.com> Applied. -- 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/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 851f793..c5d9ad7 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -5150,6 +5150,8 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, /* if count is 0 then mapping error has occurred */ count = e1000_tx_map(tx_ring, skb, first, max_per_txd, nr_frags, mss); if (count) { + skb_tx_timestamp(skb); + netdev_sent_queue(netdev, skb->len); e1000_tx_queue(tx_ring, tx_flags, count); /* Make sure there is space in the ring for the next send. */
Signed-off-by: Willem de Bruijn <willemb@google.com> --- drivers/net/ethernet/intel/e1000e/netdev.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)