mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
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>
This commit is contained in:
parent
ce3dd39595
commit
ab46d77966
1 changed files with 1 additions and 1 deletions
|
@ -660,7 +660,7 @@ static ssize_t tun_chr_aio_write(struct kiocb *iocb, const struct iovec *iv,
|
||||||
unsigned long count, loff_t pos)
|
unsigned long count, loff_t pos)
|
||||||
{
|
{
|
||||||
struct file *file = iocb->ki_filp;
|
struct file *file = iocb->ki_filp;
|
||||||
struct tun_struct *tun = file->private_data;
|
struct tun_struct *tun = tun_get(file);
|
||||||
ssize_t result;
|
ssize_t result;
|
||||||
|
|
||||||
if (!tun)
|
if (!tun)
|
||||||
|
|
Loading…
Reference in a new issue