patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / net / wan / dlci.c

diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c
index 82798fd..bad0d41 100644 (file)
--- a/drivers/net/wan/dlci.c
+++ b/drivers/net/wan/dlci.c
@@ -229,7 +229,7 @@ static int dlci_transmit(struct sk_buff *skb, struct net_device *dev)
        return(ret);
 }
 
-static int dlci_config(struct net_device *dev, struct dlci_conf *conf, int get)
+static int dlci_config(struct net_device *dev, struct dlci_conf __user *conf, int get)
 {
        struct dlci_conf        config;
        struct dlci_local       *dlp;
@@ -286,7 +286,7 @@ static int dlci_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                        if (!*(short *)(dev->dev_addr))
                                return(-EINVAL);
 
-                       return(dlci_config(dev, (struct dlci_conf *) ifr->ifr_data, cmd == DLCI_GET_CONF));
+                       return(dlci_config(dev, ifr->ifr_data, cmd == DLCI_GET_CONF));
                        break;
 
                default: 
@@ -454,7 +454,7 @@ static int dlci_del(struct dlci_add *dlci)
        return(err);
 }
 
-static int dlci_ioctl(unsigned int cmd, void *arg)
+static int dlci_ioctl(unsigned int cmd, void __user *arg)
 {
        struct dlci_add add;
        int err;