Commit ab46d779 authored Feb 14, 2009 by Herbert Xu Committed by David S. Miller Feb 14, 2009

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>

parent ce3dd395

drivers/net/tun.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)