From ae07bf0668d2fdbf636865d257000c33b15a361b Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Wed, 16 Jul 2008 12:45:34 -0700
Subject: [PATCH] --- yaml --- r: 104917 b: refs/heads/master c:
 c0e5a8c21bb9bb222917c36eba503ae88af52c34 h: refs/heads/master i:   104915:
 b8df7ba77b95d9917dbfb7a1a0341f8eef0c5c4a v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tun.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4184a3eb1ba1..375be78fa015 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25ac3c24839002298e9329a5fda305e5383b1dc7
+refs/heads/master: c0e5a8c21bb9bb222917c36eba503ae88af52c34
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index a82b32b40131..e6bbc639c2d0 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/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;