OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ce3dd39
)
tun: Fix merge error
author
Herbert Xu
<herbert@gondor.apana.org.au>
Sun, 15 Feb 2009 04:46:39 +0000
(20:46 -0800)
committer
David S. Miller
<davem@davemloft.net>
Sun, 15 Feb 2009 04:46:39 +0000
(20:46 -0800)
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>
drivers/net/tun.c
patch
|
blob
|
history
diff --git
a/drivers/net/tun.c
b/drivers/net/tun.c
index
4825c52
..
a1b0697
100644
(file)
--- 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)