| Message ID | 1335553447-11964-2-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/e1000/e1000_main.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c > index 3d712f2..40438ea 100644 > --- a/drivers/net/ethernet/intel/e1000/e1000_main.c > +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c > @@ -3261,6 +3261,8 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, > nr_frags, mss); > > if (count) { > + skb_tx_timestamp(skb); > + > e1000_tx_queue(adapter, tx_ring, tx_flags, count); > /* Make sure there is space in the ring for the next send. */ > e1000_maybe_stop_tx(netdev, tx_ring, MAX_SKB_FRAGS + 2); 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:42 +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/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c index 3d712f2..40438ea 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_main.c +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c @@ -3261,6 +3261,8 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, nr_frags, mss); if (count) { + skb_tx_timestamp(skb); + e1000_tx_queue(adapter, tx_ring, tx_flags, count); /* Make sure there is space in the ring for the next send. */ e1000_maybe_stop_tx(netdev, tx_ring, MAX_SKB_FRAGS + 2);
Signed-off-by: Willem de Bruijn <willemb@google.com> --- drivers/net/ethernet/intel/e1000/e1000_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)