openvswitch: fix a sparse warning
Fix a sparse warning introduced by commit:f579668406
(openvswitch: Add support for Geneve tunneling.) caught by kbuild test robot: reproduce: # apt-get install sparse # git checkoutf579668406
# 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>
This commit is contained in:
Родитель
42350dcaaf
Коммит
0a5d1c55fa
|
@ -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;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче