diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2009-02-14 23:46:39 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-14 23:46:39 -0500 |
commit | ab46d779661d7a03b7aa00279eead5dc3f0b3901 (patch) | |
tree | a236f027cec78999581e84b56eae0c27bce31e42 | |
parent | ce3dd39595d9d64f4ba6ee8dd24c6269a3b56b6a (diff) |
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>
-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 4825c52924bf..a1b0697340ba 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, | |||
660 | unsigned long count, loff_t pos) | 660 | unsigned long count, loff_t pos) |
661 | { | 661 | { |
662 | struct file *file = iocb->ki_filp; | 662 | struct file *file = iocb->ki_filp; |
663 | struct tun_struct *tun = file->private_data; | 663 | struct tun_struct *tun = tun_get(file); |
664 | ssize_t result; | 664 | ssize_t result; |
665 | 665 | ||
666 | if (!tun) | 666 | if (!tun) |