diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2009-02-14 20:46:39 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-14 20:46:39 -0800 |
| commit | ab46d779661d7a03b7aa00279eead5dc3f0b3901 (patch) | |
| tree | a236f027cec78999581e84b56eae0c27bce31e42 /drivers/net/tun.c | |
| parent | ce3dd39595d9d64f4ba6ee8dd24c6269a3b56b6a (diff) | |
| download | op-kernel-dev-ab46d779661d7a03b7aa00279eead5dc3f0b3901.zip op-kernel-dev-ab46d779661d7a03b7aa00279eead5dc3f0b3901.tar.gz | |
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>
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 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) |
