diff options
author | Hagen Paul Pfeifer <hagen@jauu.net> | 2009-10-07 17:43:04 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-07 17:43:04 -0400 |
commit | 9e8342971d44ce86d8567047f5366fc1c06a75ed (patch) | |
tree | 5241ff2a5db8ef2c2ef1c013cebe65dc20dba30f /net/econet/af_econet.c | |
parent | 49b4ad92d1a5bb9909deb3216ffec6f0febc7b71 (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>
Diffstat (limited to 'net/econet/af_econet.c')
-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 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, | |||
457 | iov[0].iov_len = size; | 457 | iov[0].iov_len = size; |
458 | for (i = 0; i < msg->msg_iovlen; i++) { | 458 | for (i = 0; i < msg->msg_iovlen; i++) { |
459 | void __user *base = msg->msg_iov[i].iov_base; | 459 | void __user *base = msg->msg_iov[i].iov_base; |
460 | size_t len = msg->msg_iov[i].iov_len; | 460 | size_t iov_len = msg->msg_iov[i].iov_len; |
461 | /* Check it now since we switch to KERNEL_DS later. */ | 461 | /* Check it now since we switch to KERNEL_DS later. */ |
462 | if (!access_ok(VERIFY_READ, base, len)) { | 462 | if (!access_ok(VERIFY_READ, base, iov_len)) { |
463 | mutex_unlock(&econet_mutex); | 463 | mutex_unlock(&econet_mutex); |
464 | return -EFAULT; | 464 | return -EFAULT; |
465 | } | 465 | } |
466 | iov[i+1].iov_base = base; | 466 | iov[i+1].iov_base = base; |
467 | iov[i+1].iov_len = len; | 467 | iov[i+1].iov_len = iov_len; |
468 | size += len; | 468 | size += iov_len; |
469 | } | 469 | } |
470 | 470 | ||
471 | /* Get a skbuff (no data, just holds our cb information) */ | 471 | /* Get a skbuff (no data, just holds our cb information) */ |