Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / drivers / net / pppoe.c

diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index 6f4f64d..f79e9ab 100644 (file)
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -86,6 +86,7 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb);
 static struct proto_ops pppoe_ops;
 static rwlock_t pppoe_hash_lock = RW_LOCK_UNLOCKED;
 
+static struct ppp_channel_ops pppoe_chan_ops;
 
 static inline int cmp_2_addr(struct pppoe_addr *a, struct pppoe_addr *b)
 {
@@ -691,7 +692,7 @@ static int pppoe_ioctl(struct socket *sock, unsigned int cmd,
                if (put_user(po->pppoe_dev->mtu -
                             sizeof(struct pppoe_hdr) -
                             PPP_HDRLEN,
-                            (int *) arg))
+                            (int __user *) arg))
                        break;
                err = 0;
                break;
@@ -702,7 +703,7 @@ static int pppoe_ioctl(struct socket *sock, unsigned int cmd,
                        break;
 
                err = -EFAULT;
-               if (get_user(val,(int *) arg))
+               if (get_user(val,(int __user *) arg))
                        break;
 
                if (val < (po->pppoe_dev->mtu
@@ -715,7 +716,7 @@ static int pppoe_ioctl(struct socket *sock, unsigned int cmd,
 
        case PPPIOCSFLAGS:
                err = -EFAULT;
-               if (get_user(val, (int *) arg))
+               if (get_user(val, (int __user *) arg))
                        break;
                err = 0;
                break;
@@ -736,7 +737,7 @@ static int pppoe_ioctl(struct socket *sock, unsigned int cmd,
                   PPPoE address to which frames are forwarded to */
                err = -EFAULT;
                if (copy_from_user(&po->pppoe_relay,
-                                  (void*)arg,
+                                  (void __user *)arg,
                                   sizeof(struct sockaddr_pppox)))
                        break;