linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / x25.h

diff --git a/include/linux/x25.h b/include/linux/x25.h
index d035e4e..16d4493 100644 (file)
--- a/include/linux/x25.h
+++ b/include/linux/x25.h
@@ -11,8 +11,6 @@
 #ifndef        X25_KERNEL_H
 #define        X25_KERNEL_H
 
-#include <linux/types.h>
-
 #define        SIOCX25GSUBSCRIP        (SIOCPROTOPRIVATE + 0)
 #define        SIOCX25SSUBSCRIP        (SIOCPROTOPRIVATE + 1)
 #define        SIOCX25GFACILITIES      (SIOCPROTOPRIVATE + 2)
@@ -23,8 +21,6 @@
 #define SIOCX25SCUDMATCHLEN    (SIOCPROTOPRIVATE + 7)
 #define SIOCX25CALLACCPTAPPRV   (SIOCPROTOPRIVATE + 8)
 #define SIOCX25SENDCALLACCPT    (SIOCPROTOPRIVATE + 9)
-#define SIOCX25GDTEFACILITIES (SIOCPROTOPRIVATE + 10)
-#define SIOCX25SDTEFACILITIES (SIOCPROTOPRIVATE + 11)
 
 /*
  *     Values for {get,set}sockopt.
@@ -81,8 +77,6 @@ struct x25_subscrip_struct {
 #define        X25_MASK_PACKET_SIZE    0x04
 #define        X25_MASK_WINDOW_SIZE    0x08
 
-#define X25_MASK_CALLING_AE 0x10
-#define X25_MASK_CALLED_AE 0x20
 
 
 /*
@@ -104,26 +98,6 @@ struct x25_facilities {
        unsigned int    reverse;
 };
 
-/*
-* ITU DTE facilities
-* Only the called and calling address
-* extension are currently implemented.
-* The rest are in place to avoid the struct
-* changing size if someone needs them later
-*/
-
-struct x25_dte_facilities {
-       __u16 delay_cumul;
-       __u16 delay_target;
-       __u16 delay_max;
-       __u8 min_throughput;
-       __u8 expedited;
-       __u8 calling_len;
-       __u8 called_len;
-       __u8 calling_ae[20];
-       __u8 called_ae[20];
-};
-
 /*
  *     Call User Data structure.
  */