]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
tun: Fix merge error
authorHerbert Xu <herbert@gondor.apana.org.au>
Sun, 15 Feb 2009 04:46:39 +0000 (20:46 -0800)
committerDavid 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

index 4825c52924bfbc49a29d6b57198b926c01467579..a1b0697340ba1e3214da60fe5de59091cb65818b 100644 (file)
@@ -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)