Message ID | 510652dc-54b4-0e11-657e-e37ee3ca26a9@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Commit | bd4a2697e5e27a33d345827dfbdebb8f28f4aa87 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net-next] sfc: use hardware tx timestamps for more than PTP | expand |
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Thu, 7 Apr 2022 16:24:02 +0100 you wrote: > From: Bert Kenward <bkenward@solarflare.com> > > The 8000 series and newer NICs all get hardware timestamps from the MAC > and can provide timestamps on a normal TX queue, rather than via a slow > path through the MC. As such we can use this path for any packet where a > hardware timestamp is requested. > This also enables support for PTP over transports other than IPv4+UDP. > > [...] Here is the summary with links: - [net-next] sfc: use hardware tx timestamps for more than PTP https://git.kernel.org/netdev/net-next/c/bd4a2697e5e2 You are awesome, thank you!
diff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c index d16e031e95f4..35240eb6e903 100644 --- a/drivers/net/ethernet/sfc/tx.c +++ b/drivers/net/ethernet/sfc/tx.c @@ -524,7 +524,8 @@ netdev_tx_t efx_hard_start_xmit(struct sk_buff *skb, /* PTP "event" packet */ if (unlikely(efx_xmit_with_hwtstamp(skb)) && - unlikely(efx_ptp_is_ptp_tx(efx, skb))) { + ((efx_ptp_use_mac_tx_timestamps(efx) && efx->ptp_data) || + unlikely(efx_ptp_is_ptp_tx(efx, skb)))) { /* There may be existing transmits on the channel that are * waiting for this packet to trigger the doorbell write. * We need to send the packets at this point.