Merge tag 'usercopy-v4.11-rc1.fix' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-artful-kernel.git] / include / linux / socket.h

diff --git a/include/linux/socket.h b/include/linux/socket.h
index c06438023d79bbb66bc88c7933fc184587915479..082027457825a9403d52e8bbdf7a5c0f47dbd479 100644 (file)
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -202,8 +202,12 @@ struct ucred {
 #define AF_VSOCK       40      /* vSockets                     */
 #define AF_KCM         41      /* Kernel Connection Multiplexor*/
 #define AF_QIPCRTR     42      /* Qualcomm IPC Router          */
+#define AF_SMC         43      /* smc sockets: reserve number for
+                                * PF_SMC protocol family that
+                                * reuses AF_INET address family
+                                */
 
-#define AF_MAX         43      /* For now.. */
+#define AF_MAX         44      /* For now.. */
 
 /* Protocol families, same as address families. */
 #define PF_UNSPEC      AF_UNSPEC
@@ -251,6 +255,7 @@ struct ucred {
 #define PF_VSOCK       AF_VSOCK
 #define PF_KCM         AF_KCM
 #define PF_QIPCRTR     AF_QIPCRTR
+#define PF_SMC         AF_SMC
 #define PF_MAX         AF_MAX
 
 /* Maximum queue length specifiable by listen.  */