summaryrefslogtreecommitdiffstats
path: root/include/linux/errqueue.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-28 23:34:14 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-28 23:34:14 +0100
commit38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4 (patch)
treea83d5e4e86edf6cb2de22db6f2ff2274753a2bab /include/linux/errqueue.h
parentf2d28a2ebcb525a6ec7e2152106ddb385ef52b73 (diff)
parent7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff)
downloadop-kernel-dev-38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4.zip
op-kernel-dev-38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4.tar.gz
Merge branch 'linus' into core/printk
Diffstat (limited to 'include/linux/errqueue.h')
-rw-r--r--include/linux/errqueue.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h
index ceb1454..ec12cc743 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))
OpenPOWER on IntegriCloud