diff options
author | Willem de Bruijn <willemb@google.com> | 2014-09-03 12:01:18 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-09-05 15:02:43 -0700 |
commit | c199105d154e029cd8c94cccd35bd073e64acc45 (patch) | |
tree | b268f9b6beba39274edf9b250ea3cfe22bebe25a /fs/char_dev.c | |
parent | 4357450af3422219d3f77bd54f7b9a8a40f193c9 (diff) |
net-timestamp: only report sw timestamp if reporting bit is set
The timestamping API has separate bits for generating and reporting
timestamps. A software timestamp should only be reported for a packet
when the packet has the relevant generation flag (SKBTX_..) set
and the socket has reporting bit SOF_TIMESTAMPING_SOFTWARE set.
The second check was accidentally removed. Reinstitute the original
behavior.
Tested:
Without this patch, Documentation/networking/txtimestamp reports
timestamps regardless of whether SOF_TIMESTAMPING_SOFTWARE is set.
After the patch, it only reports them when the flag is set.
Fixes: f24b9be5957b ("net-timestamp: extend SCM_TIMESTAMPING ancillary data struct")
Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/char_dev.c')
0 files changed, 0 insertions, 0 deletions