patch-2_6_7-vs1_9_1_12

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

diff --git a/include/linux/if.h b/include/linux/if.h
index 9370fd1..296a6c2 100644 (file)
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -63,6 +63,7 @@
 #define IF_IFACE_T1    0x1003          /* T1 telco serial interface    */
 #define IF_IFACE_E1    0x1004          /* E1 telco serial interface    */
 #define IF_IFACE_SYNC_SERIAL 0x1005    /* can't be set by software     */
+#define IF_IFACE_X21D   0x1006          /* X.21 Dual Clocking (FarSite) */
 
 /* For definitions see hdlc.h */
 #define IF_PROTO_HDLC  0x2000          /* raw HDLC protocol            */
@@ -77,6 +78,7 @@
 #define IF_PROTO_FR_DEL_ETH_PVC 0x2009 /*  Delete FR Ethernet-bridged PVC */
 #define IF_PROTO_FR_PVC        0x200A          /* for reading PVC status       */
 #define IF_PROTO_FR_ETH_PVC 0x200B
+#define IF_PROTO_RAW    0x200C          /* RAW Socket                   */
 
 
 /*
@@ -145,7 +147,7 @@ struct ifreq
                struct  ifmap ifru_map;
                char    ifru_slave[IFNAMSIZ];   /* Just fits the size */
                char    ifru_newname[IFNAMSIZ];
-               char __user *   ifru_data;
+               void __user *   ifru_data;
                struct  if_settings ifru_settings;
        } ifr_ifru;
 };
@@ -180,8 +182,8 @@ struct ifconf
        int     ifc_len;                        /* size of buffer       */
        union 
        {
-               char *                  ifcu_buf;
-               struct  ifreq           *ifcu_req;
+               char __user *ifcu_buf;
+               struct ifreq __user *ifcu_req;
        } ifc_ifcu;
 };
 #define        ifc_buf ifc_ifcu.ifcu_buf               /* buffer address       */