Home » Mailing list archives » linux-netdev » 2009 » February » 15

Re: [PATCH 3/3] tun: Limit amount of queued packets per device

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Herbert Xu
Subject: Re: [PATCH 3/3] tun: Limit amount of queued packets per device
Date: Saturday, February 14, 2009 - 8:15 pm

On Thu, Feb 12, 2009 at 12:35:01PM -0700, Alex Williamson wrote:

Sorry, my fault for not testing the merged result.

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>

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)

Thanks,
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 3/3] tun: Limit amount of queued packets per device, Herbert Xu, (Wed Feb 4, 3:49 am)
Re: [PATCH 3/3] tun: Limit amount of queued packets per device, David Miller, (Wed Feb 4, 5:56 pm)
Re: [PATCH 3/3] tun: Limit amount of queued packets per device, Herbert Xu, (Wed Feb 4, 6:06 pm)
Re: [PATCH 3/3] tun: Limit amount of queued packets per device, David Miller, (Wed Feb 4, 6:13 pm)
Re: [PATCH 3/3] tun: Limit amount of queued packets per device, Herbert Xu, (Wed Feb 4, 8:23 pm)
Re: [PATCH 3/3] tun: Limit amount of queued packets per device, David Miller, (Thu Feb 5, 10:25 pm)
Re: [PATCH 3/3] tun: Limit amount of queued packets per device, Alex Williamson, (Tue Feb 10, 11:33 am)
Re: [PATCH 3/3] tun: Limit amount of queued packets per device, Herbert Xu, (Thu Feb 12, 4:13 am)
Re: [PATCH 3/3] tun: Limit amount of queued packets per device, Alex Williamson, (Thu Feb 12, 12:35 pm)
Re: [PATCH 3/3] tun: Limit amount of queued packets per device, Herbert Xu, (Sat Feb 14, 8:15 pm)
Re: [PATCH 3/3] tun: Limit amount of queued packets per device, David Miller, (Sat Feb 14, 9:46 pm)