Add 802.15.4 definitions to header files.

diff --git a/ChangeLog b/ChangeLog
index b27fedef73ceb9c103944d151d7b5a4e229b906a..5943fcb90893859ab3ce8d809e46c48f0cdd528b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-06-18  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/unix/sysv/linux/bits/socket.h: Define PF_IEEE802154 and
+       AF_IEEE802154.
+       * sysdeps/unix/sysv/linux/sparc/bits/socket.h: Likewise.
+       * sysdeps/unix/sysv/linux/net/if_arp.h: Define ARPHRD_IEEE802154
+       and ARPHRD_IEEE802154_PHY.
+
+       * sysdeps/unix/sysv/linux/sparc/bits/socket.h: Add missing definitions
+       relative to generic Linux version.
+
 2009-06-17  H.J. Lu  <hongjiu.lu@intel.com>
 
        * elf/Makefile ($(objpfx)ifuncmain1pie): Use $(+link-pie).

diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
index 88062e59adf821ff73484eaf48fc373dbd26827c..f23b338a35415fc2a4a143d3e2737e851fd092f5 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
+   Copyright (C) 1991, 1992, 1994-2001, 2004, 2006, 2007, 2008, 2009
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -108,7 +108,8 @@ enum __socket_type
 #define PF_RXRPC       33      /* RxRPC sockets.  */
 #define PF_ISDN                34      /* mISDN sockets.  */
 #define PF_PHONET      35      /* Phonet sockets.  */
-#define        PF_MAX          36      /* For now..  */
+#define PF_IEEE802154  36      /* IEEE 802.15.4 sockets.  */
+#define        PF_MAX          37      /* For now..  */
 
 /* Address families.  */
 #define        AF_UNSPEC       PF_UNSPEC
@@ -148,6 +149,7 @@ enum __socket_type
 #define AF_RXRPC       PF_RXRPC
 #define AF_ISDN                PF_ISDN
 #define AF_PHONET      PF_PHONET
+#define AF_IEEE802154  PF_IEEE802154
 #define        AF_MAX          PF_MAX
 
 /* Socket level values.  Others are defined in the appropriate headers.

diff --git a/sysdeps/unix/sysv/linux/net/if_arp.h b/sysdeps/unix/sysv/linux/net/if_arp.h
index 9608652ee4ce2a5af2ffe31e498f11c3ddaf7244..97cb61f62bd657f5e2a5edc9372160b25e5ceddd 100644 (file)
--- a/sysdeps/unix/sysv/linux/net/if_arp.h
+++ b/sysdeps/unix/sysv/linux/net/if_arp.h
@@ -1,5 +1,5 @@
 /* Definitions for Address Resolution Protocol.
-   Copyright (C) 1997,1999,2001,2006 Free Software Foundation, Inc.
+   Copyright (C) 1997,1999,2001,2006,2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -128,6 +128,8 @@ struct arphdr
 #define ARPHRD_IEEE80211 801           /* IEEE 802.11.  */
 #define ARPHRD_IEEE80211_PRISM 802     /* IEEE 802.11 + Prism2 header.  */
 #define ARPHRD_IEEE80211_RADIOTAP 803  /* IEEE 802.11 + radiotap header.  */
+#define ARPHRD_IEEE802154 804          /* IEEE 802.15.4 header.  */
+#define ARPHRD_IEEE802154_PHY 805      /* IEEE 802.15.4 PHY header.  */
 
 #define ARPHRD_VOID      0xFFFF        /* Void type, nothing is known.  */
 #define ARPHRD_NONE      0xFFFE        /* Zero header length.  */

diff --git a/sysdeps/unix/sysv/linux/sparc/bits/socket.h b/sysdeps/unix/sysv/linux/sparc/bits/socket.h
index d43a3cdf794b527d81854629728932b92d6a204e..a1480720959a29bdb171b0c1840b2f51b40c33b6 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
+   Copyright (C) 1991, 1992, 1994-2001, 2004, 2006, 2007, 2008, 2009
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -94,15 +94,21 @@ enum __socket_type
 #define        PF_ASH          18      /* Ash.  */
 #define        PF_ECONET       19      /* Acorn Econet.  */
 #define        PF_ATMSVC       20      /* ATM SVCs.  */
+#define PF_RDS         21      /* RDS sockets.  */
 #define        PF_SNA          22      /* Linux SNA Project */
 #define        PF_IRDA         23      /* IRDA sockets.  */
 #define        PF_PPPOX        24      /* PPPoX sockets.  */
 #define        PF_WANPIPE      25      /* Wanpipe API sockets.  */
+#define PF_LLC         26      /* Linux LLC.  */
+#define PF_CAN         29      /* Controller Area Network.  */
+#define PF_TIPC                30      /* TIPC sockets.  */
 #define        PF_BLUETOOTH    31      /* Bluetooth sockets.  */
 #define        PF_IUCV         32      /* IUCV sockets.  */
 #define PF_RXRPC       33      /* RxRPC sockets.  */
 #define PF_ISDN                34      /* mISDN sockets.  */
-#define        PF_MAX          35      /* For now..  */
+#define PF_PHONET      35      /* Phonet sockets.  */
+#define PF_IEEE802154  36      /* IEEE 802.15.4 sockets.  */
+#define        PF_MAX          37      /* For now..  */
 
 /* Address families.  */
 #define        AF_UNSPEC       PF_UNSPEC
@@ -129,14 +135,20 @@ enum __socket_type
 #define        AF_ASH          PF_ASH
 #define        AF_ECONET       PF_ECONET
 #define        AF_ATMSVC       PF_ATMSVC
+#define AF_RDS         PF_RDS
 #define        AF_SNA          PF_SNA
 #define        AF_IRDA         PF_IRDA
 #define        AF_PPPOX        PF_PPPOX
 #define        AF_WANPIPE      PF_WANPIPE
+#define AF_LLC         PF_LLC
+#define AF_CAN         PF_CAN
+#define AF_TIPC                PF_TIPC
 #define        AF_BLUETOOTH    PF_BLUETOOTH
 #define        AF_IUCV         PF_IUCV
 #define AF_RXRPC       PF_RXRPC
 #define AF_ISDN                PF_ISDN
+#define AF_PHONET      PF_PHONET
+#define AF_IEEE802154  PF_IEEE802154
 #define        AF_MAX          PF_MAX
 
 /* Socket level values.  Others are defined in the appropriate headers.