From: Hagen Paul Pfeifer <hagen@jauu.net>
Date: Wed, 7 Oct 2009 21:43:04 +0000 (-0700)
Subject: econet: Fix redeclaration of symbol len
X-Git-Tag: MMI-PSA29.97-13-9~25754^2~883
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9e8342971d44ce86d8567047f5366fc1c06a75ed;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

econet: Fix redeclaration of symbol len

Function argument len was redeclarated within the
function. This patch fix the redeclaration of symbol 'len'.

Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c
index 6529be3a18b7..5e9426a11c3e 100644
--- a/net/econet/af_econet.c
+++ b/net/econet/af_econet.c
@@ -457,15 +457,15 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock,
 	iov[0].iov_len = size;
 	for (i = 0; i < msg->msg_iovlen; i++) {
 		void __user *base = msg->msg_iov[i].iov_base;
-		size_t len = msg->msg_iov[i].iov_len;
+		size_t iov_len = msg->msg_iov[i].iov_len;
 		/* Check it now since we switch to KERNEL_DS later. */
-		if (!access_ok(VERIFY_READ, base, len)) {
+		if (!access_ok(VERIFY_READ, base, iov_len)) {
 			mutex_unlock(&econet_mutex);
 			return -EFAULT;
 		}
 		iov[i+1].iov_base = base;
-		iov[i+1].iov_len = len;
-		size += len;
+		iov[i+1].iov_len = iov_len;
+		size += iov_len;
 	}
 
 	/* Get a skbuff (no data, just holds our cb information) */