Merge to Fedora kernel-2.6.7-1.441

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

diff --git a/include/linux/if.h b/include/linux/if.h
index fbe0106..296a6c2 100644 (file)
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -147,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;
 };
@@ -182,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       */