| Message ID | 20230306160738.4116342-1-vadfed@meta.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8ca5a5790b9a1ce147484d2a2c4e66d2553f3d6c |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net-timestamp: extend SOF_TIMESTAMPING_OPT_ID to HW timestamps | expand |
Vadim Fedorenko wrote: > When the feature was added it was enabled for SW timestamps only but > with current hardware the same out-of-order timestamps can be seen. > Let's expand the area for the feature to all types of timestamps. > > Signed-off-by: Vadim Fedorenko <vadfed@meta.com> Reviewed-by: Willem de Bruijn <willemb@google.com>
Hello: This patch was applied to netdev/net-next.git (main) by David S. Miller <davem@davemloft.net>: On Mon, 6 Mar 2023 08:07:38 -0800 you wrote: > When the feature was added it was enabled for SW timestamps only but > with current hardware the same out-of-order timestamps can be seen. > Let's expand the area for the feature to all types of timestamps. > > Signed-off-by: Vadim Fedorenko <vadfed@meta.com> > --- > net/ipv4/ip_output.c | 2 +- > net/ipv6/ip6_output.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Here is the summary with links: - [net-next] net-timestamp: extend SOF_TIMESTAMPING_OPT_ID to HW timestamps https://git.kernel.org/netdev/net-next/c/8ca5a5790b9a You are awesome, thank you!
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 4e4e308c3230..e7bef36ce26f 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -990,7 +990,7 @@ static int __ip_append_data(struct sock *sk, mtu = cork->gso_size ? IP_MAX_MTU : cork->fragsize; paged = !!cork->gso_size; - if (cork->tx_flags & SKBTX_ANY_SW_TSTAMP && + if (cork->tx_flags & SKBTX_ANY_TSTAMP && sk->sk_tsflags & SOF_TIMESTAMPING_OPT_ID) tskey = atomic_inc_return(&sk->sk_tskey) - 1; diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index c314fdde0097..4ce3f9d3bc8a 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1500,7 +1500,7 @@ static int __ip6_append_data(struct sock *sk, mtu = cork->gso_size ? IP6_MAX_MTU : cork->fragsize; orig_mtu = mtu; - if (cork->tx_flags & SKBTX_ANY_SW_TSTAMP && + if (cork->tx_flags & SKBTX_ANY_TSTAMP && sk->sk_tsflags & SOF_TIMESTAMPING_OPT_ID) tskey = atomic_inc_return(&sk->sk_tskey) - 1;
When the feature was added it was enabled for SW timestamps only but with current hardware the same out-of-order timestamps can be seen. Let's expand the area for the feature to all types of timestamps. Signed-off-by: Vadim Fedorenko <vadfed@meta.com> --- net/ipv4/ip_output.c | 2 +- net/ipv6/ip6_output.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)