diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 23:24:12 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 23:24:12 +0100 |
| commit | d00ab2fdd4dc4361c97777bc1fef7234329d4659 (patch) | |
| tree | b8d8f98c1af633bbc1570b4270b39727737beebf /include/linux/errqueue.h | |
| parent | 88f502fedba82eff252b6420e8b8328e4ae25c67 (diff) | |
| parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) | |
| download | kernel-crypto-d00ab2fdd4dc4361c97777bc1fef7234329d4659.tar.gz kernel-crypto-d00ab2fdd4dc4361c97777bc1fef7234329d4659.tar.xz kernel-crypto-d00ab2fdd4dc4361c97777bc1fef7234329d4659.zip | |
Merge branch 'linus' into core/futexes
Diffstat (limited to 'include/linux/errqueue.h')
| -rw-r--r-- | include/linux/errqueue.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h index ceb1454b697..ec12cc74366 100644 --- a/include/linux/errqueue.h +++ b/include/linux/errqueue.h @@ -18,6 +18,7 @@ struct sock_extended_err #define SO_EE_ORIGIN_LOCAL 1 #define SO_EE_ORIGIN_ICMP 2 #define SO_EE_ORIGIN_ICMP6 3 +#define SO_EE_ORIGIN_TIMESTAMPING 4 #define SO_EE_OFFENDER(ee) ((struct sockaddr*)((ee)+1)) |