projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'wireless-drivers-for-davem-2017-04-03' of git://git.kernel.org/pub/scm...
[linux-2.6-block.git]
/
include
/
uapi
/
asm-generic
/
socket.h
diff --git
a/include/uapi/asm-generic/socket.h
b/include/uapi/asm-generic/socket.h
index 2c748ddad5f875711ed66f91eae9bc69b9a41fe0..c98a52fb572a4e9ad59410f43931aa81205212ec 100644
(file)
--- a/
include/uapi/asm-generic/socket.h
+++ b/
include/uapi/asm-generic/socket.h
@@
-94,4
+94,8
@@
#define SCM_TIMESTAMPING_OPT_STATS 54
+#define SO_MEMINFO 55
+
+#define SO_INCOMING_NAPI_ID 56
+
#endif /* __ASM_GENERIC_SOCKET_H */