update

[l4.git] / l4 / pkg / linux-26-headers / include / linux / x25.h

diff --git a/l4/pkg/linux-26-headers/include/linux/x25.h b/l4/pkg/linux-26-headers/include/linux/x25.h
index d035e4e87d07c351f7617821b011ab417e0020de..810cce6737ea91649daaec069555fb267afd80f6 100644 (file)
--- a/l4/pkg/linux-26-headers/include/linux/x25.h
+++ b/l4/pkg/linux-26-headers/include/linux/x25.h
@@ -12,6 +12,7 @@
 #define        X25_KERNEL_H
 
 #include <linux/types.h>
+#include <linux/socket.h>
 
 #define        SIOCX25GSUBSCRIP        (SIOCPROTOPRIVATE + 0)
 #define        SIOCX25SSUBSCRIP        (SIOCPROTOPRIVATE + 1)
@@ -25,6 +26,7 @@
 #define SIOCX25SENDCALLACCPT    (SIOCPROTOPRIVATE + 9)
 #define SIOCX25GDTEFACILITIES (SIOCPROTOPRIVATE + 10)
 #define SIOCX25SDTEFACILITIES (SIOCPROTOPRIVATE + 11)
+#define SIOCX25SCAUSEDIAG      (SIOCPROTOPRIVATE + 12)
 
 /*
  *     Values for {get,set}sockopt.
@@ -56,7 +58,7 @@ struct x25_address {
  *     Linux X.25 Address structure, used for bind, and connect mostly.
  */
 struct sockaddr_x25 {
-       sa_family_t        sx25_family;         /* Must be AF_X25 */
+       __kernel_sa_family_t sx25_family;       /* Must be AF_X25 */
        struct x25_address sx25_addr;           /* X.121 Address */
 };