Message ID | 20211220144608.2783526-1-willemdebruijn.kernel@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Commit | a9725e1d3962ad00288c4ae6d9b518afc51b2adc |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net] docs: networking: replace skb_hwtstamp_tx with skb_tstamp_tx | expand |
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Mon, 20 Dec 2021 09:46:08 -0500 you wrote: > From: Willem de Bruijn <willemb@google.com> > > Tiny doc fix. The hardware transmit function was called skb_tstamp_tx > from its introduction in commit ac45f602ee3d ("net: infrastructure for > hardware time stamping") in the same series as this documentation. > > Fixes: cb9eff097831 ("net: new user space API for time stamping of incoming and outgoing packets") > Signed-off-by: Willem de Bruijn <willemb@google.com> > > [...] Here is the summary with links: - [net] docs: networking: replace skb_hwtstamp_tx with skb_tstamp_tx https://git.kernel.org/netdev/net/c/a9725e1d3962 You are awesome, thank you!
diff --git a/Documentation/networking/timestamping.rst b/Documentation/networking/timestamping.rst index 80b13353254a..f5809206eb93 100644 --- a/Documentation/networking/timestamping.rst +++ b/Documentation/networking/timestamping.rst @@ -582,8 +582,8 @@ Time stamps for outgoing packets are to be generated as follows: and hardware timestamping is not possible (SKBTX_IN_PROGRESS not set). - As soon as the driver has sent the packet and/or obtained a hardware time stamp for it, it passes the time stamp back by - calling skb_hwtstamp_tx() with the original skb, the raw - hardware time stamp. skb_hwtstamp_tx() clones the original skb and + calling skb_tstamp_tx() with the original skb, the raw + hardware time stamp. skb_tstamp_tx() clones the original skb and adds the timestamps, therefore the original skb has to be freed now. If obtaining the hardware time stamp somehow fails, then the driver should not fall back to software time stamping. The rationale is that