diff options
| author |   Miroslav Lichvar <mlichvar@redhat.com> | 2017-05-19 17:52:41 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-05-21 13:37:32 -0400 |
| commit | 74abc9b18f446d1a9e0602a71a22e5ffe8a2cd23 (patch) | |
| tree | 558123f0c9eebd3587869de6b568221847c674c3 /drivers/net/ethernet/intel/e1000e | |
| parent | net: allow simultaneous SW and HW transmit timestamping (diff) | |
| download | linux-dev-74abc9b18f446d1a9e0602a71a22e5ffe8a2cd23.tar.xz linux-dev-74abc9b18f446d1a9e0602a71a22e5ffe8a2cd23.zip | |
net: ethernet: update drivers to make both SW and HW TX timestamps
Some drivers were calling the skb_tx_timestamp() function only when
a hardware timestamp was not requested. Now that applications can use
the SOF_TIMESTAMPING_OPT_TX_SWHW option to request both software and
hardware timestamps, the drivers need to be modified to unconditionally
call skb_tx_timestamp().
CC: Richard Cochran <richardcochran@gmail.com>
CC: Willem de Bruijn <willemb@google.com>
Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 0ff9295ed449..6ed3bc419b96 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -5868,10 +5868,10 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, adapter->tx_hwtstamp_skb = skb_get(skb); adapter->tx_hwtstamp_start = jiffies; schedule_work(&adapter->tx_hwtstamp_work); - } else { - skb_tx_timestamp(skb); } + 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. */ |