summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHagen Paul Pfeifer <hagen@jauu.net>2009-10-07 14:43:04 -0700
committerDavid S. Miller <davem@davemloft.net>2009-10-07 14:43:04 -0700
commit9e8342971d44ce86d8567047f5366fc1c06a75ed (patch)
tree5241ff2a5db8ef2c2ef1c013cebe65dc20dba30f
parent49b4ad92d1a5bb9909deb3216ffec6f0febc7b71 (diff)
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>
-rw-r--r--net/econet/af_econet.c8
1 files changed, 4 insertions, 4 deletions
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) */