diff options
author | David S. Miller <davem@davemloft.net> | 2014-11-30 05:47:48 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-11-30 05:47:48 +0100 |
commit | 60b7379dc5b1743427b031cca53e30860a38ada6 (patch) | |
tree | c0462b8dd188861bd04f36dd31672b7446e35dd8 /Documentation/networking | |
parent | macvlan: delay the header check for dodgy packets into lower device (diff) | |
parent | Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
download | linux-60b7379dc5b1743427b031cca53e30860a38ada6.tar.xz linux-60b7379dc5b1743427b031cca53e30860a38ada6.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'Documentation/networking')
-rw-r--r-- | Documentation/networking/timestamping.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/timestamping.txt b/Documentation/networking/timestamping.txt index 412f45ca2d73..1d6d02d6ba52 100644 --- a/Documentation/networking/timestamping.txt +++ b/Documentation/networking/timestamping.txt @@ -136,7 +136,7 @@ SOF_TIMESTAMPING_OPT_ID: This option is implemented only for transmit timestamps. There, the timestamp is always looped along with a struct sock_extended_err. - The option modifies field ee_info to pass an id that is unique + The option modifies field ee_data to pass an id that is unique among all possibly concurrently outstanding timestamp requests for that socket. In practice, it is a monotonically increasing u32 (that wraps). |