diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-22 17:54:47 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-22 17:54:47 -0700 |
| commit | 7cf75262a4aafe1483349e897bf905e121314dff (patch) | |
| tree | 9a11d432ff3add3204c4bc5a01b6d12c4df7e9d9 /drivers/net/tun.c | |
| parent | c8f15686a4b3345e3e81e09cfe191df58bbedd45 (diff) | |
| parent | b0e453902ad53580a77c2b1baddcc0b2d8ce8acc (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/tun.c')
| -rw-r--r-- | drivers/net/tun.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index a82b32b4013..e6bbc639c2d 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -900,7 +900,7 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file, if ((tun->flags & TUN_TYPE_MASK) != TUN_TAP_DEV) return -EINVAL; rtnl_lock(); - ret = update_filter(&tun->txflt, (void *) __user arg); + ret = update_filter(&tun->txflt, (void __user *)arg); rtnl_unlock(); return ret; |