Minor net/ fixes

Minor net/ fixes

[Hagen Paul Pfeifer]

Hello netdev, hello davem,

I, ... I mean cgcc stumbled across several dubious code. The
following patches address them. ;)

Hagen

-- 
Hagen Paul Pfeifer <hagen@jauu.net>  ||  http://jauu.net/
Telephone: +49 174 5455209           ||  Key Id: 0x98350C22
Key Fingerprint: 490F 557B 6C48 6D7E 5706 2EA2 4A22 8D45 9835 0C22

[PATCH 1/3] Fix redeclaration of symbol len

[Hagen Paul Pfeifer]

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>
---
 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 6529be3..5e9426a 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) */
-- 
1.6.3.GIT

Re: [PATCH 1/3] Fix redeclaration of symbol len

[David Miller]

From: Hagen Paul Pfeifer <hagen@jauu.net>
Date: Wed,  7 Oct 2009 23:34:40 +0200

> 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>

In the future please indicate the area you are touching
in the subject line so that it shows up in the header
line of the commit message.  I added "econet: " to your
subject to fix this.

Applied, thanks.

[PATCH 2/3] Incomplete type for struct in6_addr

[Hagen Paul Pfeifer]

if_tunnel.h defines a new struct consisting of struct in6_addr,
but the definition is defined in linux/in6.h - so we must
include them beforehand.

Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>
---
 include/linux/if_tunnel.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index c53c8e0..8d76cb4 100644
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -5,6 +5,7 @@
 
 #ifdef __KERNEL__
 #include <linux/ip.h>
+#include <linux/in6.h>
 #endif
 
 #define SIOCGETTUNNEL   (SIOCDEVPRIVATE + 0)
-- 
1.6.3.GIT

Re: [PATCH 2/3] Incomplete type for struct in6_addr

[David Miller]

From: Hagen Paul Pfeifer <hagen@jauu.net>
Date: Wed,  7 Oct 2009 23:34:41 +0200

> if_tunnel.h defines a new struct consisting of struct in6_addr,
> but the definition is defined in linux/in6.h - so we must
> include them beforehand.
> 
> Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>

Already fixed in net-next-2.6

[PATCH 3/3] Define cipso_v4_delopt static

[Hagen Paul Pfeifer]

There is no reason that cipso_v4_delopt() is not
defined as a static function.

Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>
---
 net/ipv4/cipso_ipv4.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c
index 039cc1f..1e029dc 100644
--- a/net/ipv4/cipso_ipv4.c
+++ b/net/ipv4/cipso_ipv4.c
@@ -2017,7 +2017,7 @@ req_setattr_failure:
  * values on failure.
  *
  */
-int cipso_v4_delopt(struct ip_options **opt_ptr)
+static int cipso_v4_delopt(struct ip_options **opt_ptr)
 {
 	int hdr_delta = 0;
 	struct ip_options *opt = *opt_ptr;
-- 
1.6.3.GIT

Re: [PATCH 3/3] Define cipso_v4_delopt static

[David Miller]

From: Hagen Paul Pfeifer <hagen@jauu.net>
Date: Wed,  7 Oct 2009 23:34:42 +0200

> There is no reason that cipso_v4_delopt() is not
> defined as a static function.
> 
> Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>

Also applied, thanks.

Same subject line problem, I added "ipv4: " to this one.