diff options
| author | Hagen Paul Pfeifer <hagen@jauu.net> | 2009-10-07 14:43:04 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-09 15:55:33 -0700 |
| commit | 8200a2e148cb2c01ef8a1ee77fd893227b4e15d4 (patch) | |
| tree | 10b680f3a19cb6d5e6ed08e746ffb2d08531649f | |
| parent | 46e8f021c9864285e6bc223f9ef61bc72e77d07a (diff) | |
econet: Fix redeclaration of symbol len
commit 9e8342971d44ce86d8567047f5366fc1c06a75ed upstream.
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>
[Adjusted to apply to 2.6.32 by dann frazier <dannf@debian.org>]
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | net/econet/af_econet.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c index 2a3b4e79166..f26b71e0fde 100644 --- a/net/econet/af_econet.c +++ b/net/econet/af_econet.c @@ -447,15 +447,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) */ |