[net-next 1/2] net: fix a sparse warning

[net-next 1/2] net: fix a sparse warning

[Andy Zhou]

Fix a sparse warning introduced by Commit
0b5e8b8eeae40bae6ad7c7e91c97c3c0d0e57882 (net: Add Geneve tunneling
protocol driver) caught by kbuild test robot:

  # apt-get install sparse
  #   git checkout 0b5e8b8eeae40bae6ad7c7e91c97c3c0d0e57882
  #     make ARCH=x86_64 allmodconfig
  #       make C=1 CF=-D__CHECK_ENDIAN__
  #
  #
  #       sparse warnings: (new ones prefixed by >>)
  #
  #       >> net/ipv4/geneve.c:230:42: sparse: incorrect type in assignment (different base types)
  #          net/ipv4/geneve.c:230:42:    expected restricted __be32 [addressable] [assigned] [usertype] s_addr
  #             net/ipv4/geneve.c:230:42:    got unsigned long [unsigned] <noident>
  #

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Andy Zhou <azhou@nicira.com>
---
 net/ipv4/geneve.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv4/geneve.c b/net/ipv4/geneve.c
index f008c55..065cd94 100644
--- a/net/ipv4/geneve.c
+++ b/net/ipv4/geneve.c
@@ -227,7 +227,7 @@ static struct socket *geneve_create_sock(struct net *net, bool ipv6,
 		udp_conf.family = AF_INET6;
 	} else {
 		udp_conf.family = AF_INET;
-		udp_conf.local_ip.s_addr = INADDR_ANY;
+		udp_conf.local_ip.s_addr = htonl(INADDR_ANY);
 	}
 
 	udp_conf.local_udp_port = port;
-- 
1.7.9.5

[net-next 2/2] openvswitch: fix a sparse warning

[Andy Zhou]

Fix a sparse warning introduced by commit:
f5796684069e0c71c65bce6a6d4766114aec1396 (openvswitch: Add support for
Geneve tunneling.) caught by kbuild test robot:

reproduce:
  # apt-get install sparse
  #   git checkout f5796684069e0c71c65bce6a6d4766114aec1396
  #     make ARCH=x86_64 allmodconfig
  #       make C=1 CF=-D__CHECK_ENDIAN__
  #
  #
  #       sparse warnings: (new ones prefixed by >>)
  #
  #       >> net/openvswitch/vport-geneve.c:109:15: sparse: incorrect type in assignment (different base types)
  #          net/openvswitch/vport-geneve.c:109:15:    expected restricted __be16 [usertype] sport
  #             net/openvswitch/vport-geneve.c:109:15:    got int
  #             >> net/openvswitch/vport-geneve.c:110:56: sparse: incorrect type in argument 3 (different base types)
  #                net/openvswitch/vport-geneve.c:110:56:    expected unsigned short [unsigned] [usertype] value
  #                   net/openvswitch/vport-geneve.c:110:56:    got restricted __be16 [usertype] sport

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Andy Zhou <azhou@nicira.com>
---
 net/openvswitch/vport-geneve.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/net/openvswitch/vport-geneve.c b/net/openvswitch/vport-geneve.c
index 5572d48..910b3ef 100644
--- a/net/openvswitch/vport-geneve.c
+++ b/net/openvswitch/vport-geneve.c
@@ -104,10 +104,9 @@ static int geneve_get_options(const struct vport *vport,
 			      struct sk_buff *skb)
 {
 	struct geneve_port *geneve_port = geneve_vport(vport);
-	__be16 sport;
+	struct inet_sock *sk = inet_sk(geneve_port->gs->sock->sk);
 
-	sport = ntohs(inet_sk(geneve_port->gs->sock->sk)->inet_sport);
-	if (nla_put_u16(skb, OVS_TUNNEL_ATTR_DST_PORT, sport))
+	if (nla_put_u16(skb, OVS_TUNNEL_ATTR_DST_PORT, ntohs(sk->inet_sport)))
 		return -EMSGSIZE;
 	return 0;
 }
-- 
1.7.9.5

Re: [net-next 2/2] openvswitch: fix a sparse warning

[David Miller]

From: Andy Zhou <azhou@nicira.com>
Date: Mon,  6 Oct 2014 13:22:51 -0700

> Fix a sparse warning introduced by commit:
> f5796684069e0c71c65bce6a6d4766114aec1396 (openvswitch: Add support for
> Geneve tunneling.) caught by kbuild test robot:
> 
> reproduce:
>   # apt-get install sparse
>   #   git checkout f5796684069e0c71c65bce6a6d4766114aec1396
>   #     make ARCH=x86_64 allmodconfig
>   #       make C=1 CF=-D__CHECK_ENDIAN__
>   #
>   #
>   #       sparse warnings: (new ones prefixed by >>)
>   #
>   #       >> net/openvswitch/vport-geneve.c:109:15: sparse: incorrect type in assignment (different base types)
>   #          net/openvswitch/vport-geneve.c:109:15:    expected restricted __be16 [usertype] sport
>   #             net/openvswitch/vport-geneve.c:109:15:    got int
>   #             >> net/openvswitch/vport-geneve.c:110:56: sparse: incorrect type in argument 3 (different base types)
>   #                net/openvswitch/vport-geneve.c:110:56:    expected unsigned short [unsigned] [usertype] value
>   #                   net/openvswitch/vport-geneve.c:110:56:    got restricted __be16 [usertype] sport
> 
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> Signed-off-by: Andy Zhou <azhou@nicira.com>

Applied.

Re: [net-next 1/2] net: fix a sparse warning

[David Miller]

From: Andy Zhou <azhou@nicira.com>
Date: Mon,  6 Oct 2014 13:22:50 -0700

> Fix a sparse warning introduced by Commit
> 0b5e8b8eeae40bae6ad7c7e91c97c3c0d0e57882 (net: Add Geneve tunneling
> protocol driver) caught by kbuild test robot:
> 
>   # apt-get install sparse
>   #   git checkout 0b5e8b8eeae40bae6ad7c7e91c97c3c0d0e57882
>   #     make ARCH=x86_64 allmodconfig
>   #       make C=1 CF=-D__CHECK_ENDIAN__
>   #
>   #
>   #       sparse warnings: (new ones prefixed by >>)
>   #
>   #       >> net/ipv4/geneve.c:230:42: sparse: incorrect type in assignment (different base types)
>   #          net/ipv4/geneve.c:230:42:    expected restricted __be32 [addressable] [assigned] [usertype] s_addr
>   #             net/ipv4/geneve.c:230:42:    got unsigned long [unsigned] <noident>
>   #
> 
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> Signed-off-by: Andy Zhou <azhou@nicira.com>

Applied.