summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAndy Zhou <azhou@nicira.com>2014-10-06 13:22:51 -0700
committerDavid S. Miller <davem@davemloft.net>2014-10-07 00:10:48 -0400
commit0a5d1c55faa5414858857875496f6f6a9926fa51 (patch)
tree6695de936e1c1934a25a538c4577c0367e8a316e /net
parent42350dcaaf1d8d95d58e8b43aee006d62c84bc2e (diff)
downloadlinux-0a5d1c55faa5414858857875496f6f6a9926fa51.tar.bz2
openvswitch: fix a sparse warning
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> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/openvswitch/vport-geneve.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/openvswitch/vport-geneve.c b/net/openvswitch/vport-geneve.c
index 5572d482f285..910b3ef2c0d5 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;
}