p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gre/ipip: use be16 variants of netlink functions 

encap.sport and encap.dport are __be16, use nla_{get,put}_be16 instead
of nla_{get,put}_u16.

Fixes the sparse warnings:

warning: incorrect type in assignment (different base types)
   expected restricted __be32 [addressable] [usertype] o_key
   got restricted __be16 [addressable] [usertype] i_flags
warning: incorrect type in assignment (different base types)
   expected restricted __be16 [usertype] sport
   got unsigned short
warning: incorrect type in assignment (different base types)
   expected restricted __be16 [usertype] dport
   got unsigned short
warning: incorrect type in argument 3 (different base types)
   expected unsigned short [unsigned] [usertype] value
   got restricted __be16 [usertype] sport
warning: incorrect type in argument 3 (different base types)
   expected unsigned short [unsigned] [usertype] value
   got restricted __be16 [usertype] dport

Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sabrina Dubroca 2015-02-06 17:22:22 +01:00 committed by David S. Miller
parent 51a00daf73
commit 3e97fa7059
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/ipv4/ip_gre.c
View File

@ -659,12 +659,12 @@ static bool ipgre_netlink_encap_parms(struct nlattr *data[],
if (data[IFLA_GRE_ENCAP_SPORT]) { if (data[IFLA_GRE_ENCAP_SPORT]) {
ret = true; ret = true;
ipencap->sport = nla_get_u16(data[IFLA_GRE_ENCAP_SPORT]); ipencap->sport = nla_get_be16(data[IFLA_GRE_ENCAP_SPORT]);
} }
if (data[IFLA_GRE_ENCAP_DPORT]) { if (data[IFLA_GRE_ENCAP_DPORT]) {
ret = true; ret = true;
ipencap->dport = nla_get_u16(data[IFLA_GRE_ENCAP_DPORT]); ipencap->dport = nla_get_be16(data[IFLA_GRE_ENCAP_DPORT]);
} }
return ret; return ret;
@ -786,10 +786,10 @@ static int ipgre_fill_info(struct sk_buff *skb, const struct net_device *dev)
if (nla_put_u16(skb, IFLA_GRE_ENCAP_TYPE, if (nla_put_u16(skb, IFLA_GRE_ENCAP_TYPE,
t->encap.type) || t->encap.type) ||
nla_put_u16(skb, IFLA_GRE_ENCAP_SPORT, nla_put_be16(skb, IFLA_GRE_ENCAP_SPORT,
t->encap.sport) || t->encap.sport) ||
nla_put_u16(skb, IFLA_GRE_ENCAP_DPORT, nla_put_be16(skb, IFLA_GRE_ENCAP_DPORT,
t->encap.dport) || t->encap.dport) ||
nla_put_u16(skb, IFLA_GRE_ENCAP_FLAGS, nla_put_u16(skb, IFLA_GRE_ENCAP_FLAGS,
t->encap.flags)) t->encap.flags))
goto nla_put_failure; goto nla_put_failure;

12
net/ipv4/ipip.c
View File

@ -366,12 +366,12 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[],
if (data[IFLA_IPTUN_ENCAP_SPORT]) { if (data[IFLA_IPTUN_ENCAP_SPORT]) {
ret = true; ret = true;
ipencap->sport = nla_get_u16(data[IFLA_IPTUN_ENCAP_SPORT]); ipencap->sport = nla_get_be16(data[IFLA_IPTUN_ENCAP_SPORT]);
} }
if (data[IFLA_IPTUN_ENCAP_DPORT]) { if (data[IFLA_IPTUN_ENCAP_DPORT]) {
ret = true; ret = true;
ipencap->dport = nla_get_u16(data[IFLA_IPTUN_ENCAP_DPORT]); ipencap->dport = nla_get_be16(data[IFLA_IPTUN_ENCAP_DPORT]);
} }
return ret; return ret;
@ -460,10 +460,10 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev)
if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE, if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE,
tunnel->encap.type) || tunnel->encap.type) ||
nla_put_u16(skb, IFLA_IPTUN_ENCAP_SPORT, nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT,
tunnel->encap.sport) || tunnel->encap.sport) ||
nla_put_u16(skb, IFLA_IPTUN_ENCAP_DPORT, nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT,
tunnel->encap.dport) || tunnel->encap.dport) ||
nla_put_u16(skb, IFLA_IPTUN_ENCAP_FLAGS, nla_put_u16(skb, IFLA_IPTUN_ENCAP_FLAGS,
tunnel->encap.flags)) tunnel->encap.flags))
goto nla_put_failure; goto nla_put_failure;