From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sun, 15 Feb 2009 04:46:39 +0000 (-0800)
Subject: tun: Fix merge error
X-Git-Tag: v2.6.30-rc1~662^2~741
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ab46d779661d7a03b7aa00279eead5dc3f0b3901;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

tun: Fix merge error

When forward-porting the tun accounting patch I managed to break
the send path compltely by dropping the tun_get call.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 4825c52..a1b0697 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -660,7 +660,7 @@ static ssize_t tun_chr_aio_write(struct kiocb *iocb, const struct iovec *iv,
 			      unsigned long count, loff_t pos)
 {
 	struct file *file = iocb->ki_filp;
-	struct tun_struct *tun = file->private_data;
+	struct tun_struct *tun = tun_get(file);
 	ssize_t result;
 
 	if (!tun)