Merge branches 'acpica-fixes', 'acpi-pci-fixes' and 'acpi-debug-fixes'

[deliverable/linux.git] / include / linux / socket.h

diff --git a/include/linux/socket.h b/include/linux/socket.h
index 73bf6c6a833b37b907bc6f8852356d8976b9662d..b5cc5a6d7011a06e0310d5bf0136dd42569bda03 100644 (file)
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -201,8 +201,9 @@ struct ucred {
 #define AF_NFC         39      /* NFC sockets                  */
 #define AF_VSOCK       40      /* vSockets                     */
 #define AF_KCM         41      /* Kernel Connection Multiplexor*/
+#define AF_QIPCRTR     42      /* Qualcomm IPC Router          */
 
-#define AF_MAX         42      /* For now.. */
+#define AF_MAX         43      /* For now.. */
 
 /* Protocol families, same as address families. */
 #define PF_UNSPEC      AF_UNSPEC
@@ -249,6 +250,7 @@ struct ucred {
 #define PF_NFC         AF_NFC
 #define PF_VSOCK       AF_VSOCK
 #define PF_KCM         AF_KCM
+#define PF_QIPCRTR     AF_QIPCRTR
 #define PF_MAX         AF_MAX
 
 /* Maximum queue length specifiable by listen.  */