diff options
| author | David S. Miller <davem@davemloft.net> | 2014-12-08 20:20:55 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-08 20:20:55 -0500 |
| commit | aae68bc6f69a574beceeca6d323636782c437fa6 (patch) | |
| tree | b0adfab040099b369f38ebe9a19df9632f85ded8 /include | |
| parent | 8d0c4697534a739725e429ff062dea393d8860d1 (diff) | |
| parent | cbd3aad5ce66f5a266a185aa37e0eb9be9ba4154 (diff) | |
| download | lwn-aae68bc6f69a574beceeca6d323636782c437fa6.tar.gz lwn-aae68bc6f69a574beceeca6d323636782c437fa6.zip | |
Merge branch 'tstamp-next'
Willem de Bruijn says:
====================
timestamping updates
The main goal for this patchset is to allow correlating timestamps
with the egress interface. Also introduce a warning, as discussed
previously, and update the tests to verify the new feature.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/net_tstamp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/net_tstamp.h b/include/uapi/linux/net_tstamp.h index ff354021bb69..edbc888ceb51 100644 --- a/include/uapi/linux/net_tstamp.h +++ b/include/uapi/linux/net_tstamp.h @@ -23,8 +23,9 @@ enum { SOF_TIMESTAMPING_OPT_ID = (1<<7), SOF_TIMESTAMPING_TX_SCHED = (1<<8), SOF_TIMESTAMPING_TX_ACK = (1<<9), + SOF_TIMESTAMPING_OPT_CMSG = (1<<10), - SOF_TIMESTAMPING_LAST = SOF_TIMESTAMPING_TX_ACK, + SOF_TIMESTAMPING_LAST = SOF_TIMESTAMPING_OPT_CMSG, SOF_TIMESTAMPING_MASK = (SOF_TIMESTAMPING_LAST - 1) | SOF_TIMESTAMPING_LAST }; |