Skip to contentSkip to conversation

tun: use iov_length()

PATCH Applied Akinobu Mita 2 participants 2 messages Nov 17, 2007 – Nov 20, 2007

Subsystems (3)
Networking Network drivers TUN/TAP driver
lore
Share & tools
lore

Akinobu Mita

author
#0 lore raw

PATCH 1/1 tun: use iov_length()

Use iov_length() instead of tun's homemade iov_total().

Cc Maxim Krasnyansky <[email protected]>
Signed-off-by Akinobu Mita <[email protected]>
---
 drivers/net/tun.c |   15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)
drivers/net/tun.c +2 -13
Index: 2.6-mm/drivers/net/tun.c
===================================================================
@@ -292,17 +292,6 @@ static __inline__ ssize_t tun_get_user(s
 	return count;
 }
 
-static inline size_t iov_total(const struct iovec *iv, unsigned long count)
-{
-	unsigned long i;
-	size_t len;
-
-	for (i = 0, len = 0; i < count; i++)
-		len += iv[i].iov_len;
-
-	return len;
-}
-
 static ssize_t tun_chr_aio_write(struct kiocb *iocb, const struct iovec *iv,
 			      unsigned long count, loff_t pos)
 {

@@ -313,7 +302,7 @@ static ssize_t tun_chr_aio_write(struct 
 
 	DBG(KERN_INFO "%s: tun_chr_write %ld\n", tun->dev->name, count);
 
-	return tun_get_user(tun, (struct iovec *) iv, iov_total(iv, count));
+	return tun_get_user(tun, (struct iovec *) iv, iov_length(iv, count));
 }
 
 /* Put packet to the user space buffer */

@@ -364,7 +353,7 @@ static ssize_t tun_chr_aio_read(struct k
 
 	DBG(KERN_INFO "%s: tun_chr_read\n", tun->dev->name);
 
-	len = iov_total(iv, count);
+	len = iov_length(iv, count);
 	if (len < 0)
 		return -EINVAL;