econet: Fix redeclaration of symbol len
authorHagen Paul Pfeifer <hagen@jauu.net>
Wed, 7 Oct 2009 21:43:04 +0000 (14:43 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 7 Oct 2009 21:43:04 +0000 (14:43 -0700)
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>
net/econet/af_econet.c

index 6529be3a18b7968e83652dcab05ac9edaacd1d3e..5e9426a11c3ed8955c2f46af8d3d3c0f14b75cf4 100644 (file)
@@ -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) */