git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
include
/
uapi
/
asm
/
socket.h
diff --git
a/arch/mips/include/uapi/asm/socket.h
b/arch/mips/include/uapi/asm/socket.h
index 882823bec153a69e91522757058d5edaeb4bc64a..6c755bc0797513179d3865bd780ea9bab8a199e5 100644
(file)
--- a/
arch/mips/include/uapi/asm/socket.h
+++ b/
arch/mips/include/uapi/asm/socket.h
@@
-120,4
+120,6
@@
#define SO_PEERGROUPS 59
+#define SO_ZEROCOPY 60
+
#endif /* _UAPI_ASM_SOCKET_H */