Add definitions for new socket protocols.

(cherry picked from commit a77e8cbc394ab098aa1fc3f0a6645a38348d21ca)

diff --git a/ChangeLog b/ChangeLog
index 76eb85882b0fe63cb074aa080d7d43524d677fb1..267338ce68e68e29b7d938850882584274aafe26 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-17  Ulrich Drepper  <drepper@gmail.com>
+
+       * sysdeps/unix/sysv/linux/bits/socket.h: Define AF_CAIF, AF_ALG,
+       PF_CAIF, and PF_ALG.
+       * sysdeps/unix/sysv/linux/sparc/bits/socket.h: Likewise.
+
 2011-01-15  Ulrich Drepper  <drepper@gmail.com>
 
        [BZ #6812]

diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
index f23b338a35415fc2a4a143d3e2737e851fd092f5..d77e34b8746f88400217d31beffd75763409deb1 100644 (file)
--- a/sysdeps/unix/sysv/linux/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/bits/socket.h
@@ -1,5 +1,5 @@
 /* System-specific socket constants and types.  Linux version.
-   Copyright (C) 1991, 1992, 1994-2001, 2004, 2006, 2007, 2008, 2009
+   Copyright (C) 1991, 1992, 1994-2001, 2004, 2006-2010, 2011
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -109,7 +109,9 @@ enum __socket_type
 #define PF_ISDN                34      /* mISDN sockets.  */
 #define PF_PHONET      35      /* Phonet sockets.  */
 #define PF_IEEE802154  36      /* IEEE 802.15.4 sockets.  */
-#define        PF_MAX          37      /* For now..  */
+#define PF_CAIF                37      /* CAIF sockets.  */
+#define PF_ALG         38      /* Algorithm sockets.  */
+#define        PF_MAX          39      /* For now..  */
 
 /* Address families.  */
 #define        AF_UNSPEC       PF_UNSPEC
@@ -150,6 +152,8 @@ enum __socket_type
 #define AF_ISDN                PF_ISDN
 #define AF_PHONET      PF_PHONET
 #define AF_IEEE802154  PF_IEEE802154
+#define AF_CAIF                PF_CAIF
+#define AF_ALG         PF_ALG
 #define        AF_MAX          PF_MAX
 
 /* Socket level values.  Others are defined in the appropriate headers.

diff --git a/sysdeps/unix/sysv/linux/sparc/bits/socket.h b/sysdeps/unix/sysv/linux/sparc/bits/socket.h
index a1480720959a29bdb171b0c1840b2f51b40c33b6..141ea27864cf469796d2f796c7c422ff588f7c24 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/socket.h
@@ -1,5 +1,5 @@
 /* System-specific socket constants and types.  Linux/SPARC version.
-   Copyright (C) 1991, 1992, 1994-2001, 2004, 2006, 2007, 2008, 2009
+   Copyright (C) 1991, 1992, 1994-2001, 2004, 2006, 2007, 2008, 2009, 2011
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -108,7 +108,9 @@ enum __socket_type
 #define PF_ISDN                34      /* mISDN sockets.  */
 #define PF_PHONET      35      /* Phonet sockets.  */
 #define PF_IEEE802154  36      /* IEEE 802.15.4 sockets.  */
-#define        PF_MAX          37      /* For now..  */
+#define PF_CAIF                37      /* CAIF sockets.  */
+#define PF_ALG         38      /* Algorithm sockets.  */
+#define        PF_MAX          39      /* For now..  */
 
 /* Address families.  */
 #define        AF_UNSPEC       PF_UNSPEC
@@ -149,6 +151,8 @@ enum __socket_type
 #define AF_ISDN                PF_ISDN
 #define AF_PHONET      PF_PHONET
 #define AF_IEEE802154  PF_IEEE802154
+#define AF_CAIF                PF_CAIF
+#define AF_ALG         PF_ALG
 #define        AF_MAX          PF_MAX
 
 /* Socket level values.  Others are defined in the appropriate headers.
@@ -233,8 +237,8 @@ enum
 #define        MSG_MORE        MSG_MORE
 
     MSG_CMSG_CLOEXEC   = 0x40000000    /* Set close_on_exit for file
-                                           descriptor received through
-                                           SCM_RIGHTS.  */
+                                          descriptor received through
+                                          SCM_RIGHTS.  */
 #define MSG_CMSG_CLOEXEC MSG_CMSG_CLOEXEC
   };