projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[powerpc.git]
/
include
/
asm-alpha
/
socket.h
diff --git
a/include/asm-alpha/socket.h
b/include/asm-alpha/socket.h
index
b519322
..
1fede7f
100644
(file)
--- a/
include/asm-alpha/socket.h
+++ b/
include/asm-alpha/socket.h
@@
-51,6
+51,9
@@
#define SCM_TIMESTAMP SO_TIMESTAMP
#define SO_PEERSEC 30
#define SCM_TIMESTAMP SO_TIMESTAMP
#define SO_PEERSEC 30
+#define SO_PASSSEC 34
+#define SO_TIMESTAMPNS 35
+#define SCM_TIMESTAMPNS SO_TIMESTAMPNS
/* Security levels - as per NRL IPv6 - don't actually do anything */
#define SO_SECURITY_AUTHENTICATION 19
/* Security levels - as per NRL IPv6 - don't actually do anything */
#define SO_SECURITY_AUTHENTICATION 19