From: Stephen Mallon <stephen.mallon@sydney.edu.au>
To: "David S. Miller" <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>, <stephen.mallon@sydney.edu.au>
Subject: [PATCH net] ipv4: Fix updating SOF_TIMESTAMPING_OPT_ID when SKBTX_HW_TSTAMP is enabled
Date: Sun, 28 Apr 2019 15:45:21 +1000 [thread overview]
Message-ID: <20190428054521.GA14504@stephen-mallon> (raw)
Ensure that the unique timestamp identifier is incremented for skb hardware
timestamps, not just software timestamps.
Signed-off-by: Stephen Mallon <stephen.mallon@sydney.edu.au>
---
net/ipv4/ip_output.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index c80188875f39..96ef1d467ba7 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -891,7 +891,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 = sk->sk_tskey++;
--
2.18.1
next reply other threads:[~2019-04-28 5:53 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-28 5:45 Stephen Mallon [this message]
2019-04-28 15:19 ` [PATCH net] ipv4: Fix updating SOF_TIMESTAMPING_OPT_ID when SKBTX_HW_TSTAMP is enabled Richard Cochran
2019-04-29 2:57 ` Willem de Bruijn
2019-04-29 15:02 ` Richard Cochran
2019-04-29 15:32 ` Willem de Bruijn
2019-04-30 1:17 ` Stephen Mallon
2019-04-30 2:54 ` Richard Cochran
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190428054521.GA14504@stephen-mallon \
--to=stephen.mallon@sydney.edu.au \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).