patch-2_6_7-vs1_9_1_12

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

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index e6df23f..d0fe0f6 100644 (file)
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -129,8 +129,8 @@ static void tun_net_init(struct net_device *dev)
                dev->addr_len = 0;
                dev->mtu = 1500;
 
-               /* Type PPP seems most suitable */
-               dev->type = ARPHRD_PPP; 
+               /* Zero header length */
+               dev->type = ARPHRD_NONE; 
                dev->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST;
                dev->tx_queue_len = 10;
                break;
@@ -241,10 +241,10 @@ static ssize_t tun_chr_writev(struct file * file, const struct iovec *iv,
 }
 
 /* Write */
-static ssize_t tun_chr_write(struct file * file, const char * buf, 
+static ssize_t tun_chr_write(struct file * file, const char __user * buf, 
                             size_t count, loff_t *pos)
 {
-       struct iovec iv = { (void *) buf, count };
+       struct iovec iv = { (void __user *) buf, count };
        return tun_chr_writev(file, &iv, 1, pos);
 }
 
@@ -333,7 +333,7 @@ static ssize_t tun_chr_readv(struct file *file, const struct iovec *iv,
 }
 
 /* Read */
-static ssize_t tun_chr_read(struct file * file, char * buf, 
+static ssize_t tun_chr_read(struct file * file, char __user * buf, 
                            size_t count, loff_t *pos)
 {
        struct iovec iv = { buf, count };
@@ -462,7 +462,7 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file,
                struct ifreq ifr;
                int err;
 
-               if (copy_from_user(&ifr, (void *)arg, sizeof(ifr)))
+               if (copy_from_user(&ifr, (void __user *)arg, sizeof(ifr)))
                        return -EFAULT;
                ifr.ifr_name[IFNAMSIZ-1] = '\0';
 
@@ -473,7 +473,7 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file,
                if (err)
                        return err;
 
-               if (copy_to_user((void *)arg, &ifr, sizeof(ifr)))
+               if (copy_to_user((void __user *)arg, &ifr, sizeof(ifr)))
                        return -EFAULT;
                return 0;
        }