Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e97fa70 authored by Sabrina Dubroca's avatar Sabrina Dubroca Committed by David S. Miller
Browse files

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: default avatarSabrina Dubroca <sd@queasysnail.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 51a00daf

net/ipv4/ip_gre.c

+6 −6
Original line number Diff line number Diff line
@@ -659,12 +659,12 @@ static bool ipgre_netlink_encap_parms(struct nlattr *data[], 


	if (data[IFLA_GRE_ENCAP_SPORT]) {

		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]) {

		ret = true;

		ipencap->dport = nla_get_u16(data[IFLA_GRE_ENCAP_DPORT]);

		ipencap->dport = nla_get_be16(data[IFLA_GRE_ENCAP_DPORT]);

	}



	return ret;
@@ -786,9 +786,9 @@ static int ipgre_fill_info(struct sk_buff *skb, const struct net_device *dev) 


	if (nla_put_u16(skb, IFLA_GRE_ENCAP_TYPE,

			t->encap.type) ||

	    nla_put_u16(skb, IFLA_GRE_ENCAP_SPORT,

	    nla_put_be16(skb, IFLA_GRE_ENCAP_SPORT,

			 t->encap.sport) ||

	    nla_put_u16(skb, IFLA_GRE_ENCAP_DPORT,

	    nla_put_be16(skb, IFLA_GRE_ENCAP_DPORT,

			 t->encap.dport) ||

	    nla_put_u16(skb, IFLA_GRE_ENCAP_FLAGS,

			t->encap.flags))

net/ipv4/ipip.c

+6 −6
Original line number Diff line number Diff line
@@ -366,12 +366,12 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[], 


	if (data[IFLA_IPTUN_ENCAP_SPORT]) {

		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]) {

		ret = true;

		ipencap->dport = nla_get_u16(data[IFLA_IPTUN_ENCAP_DPORT]);

		ipencap->dport = nla_get_be16(data[IFLA_IPTUN_ENCAP_DPORT]);

	}



	return ret;
@@ -460,9 +460,9 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev) 


	if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE,

			tunnel->encap.type) ||

	    nla_put_u16(skb, IFLA_IPTUN_ENCAP_SPORT,

	    nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT,

			 tunnel->encap.sport) ||

	    nla_put_u16(skb, IFLA_IPTUN_ENCAP_DPORT,

	    nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT,

			 tunnel->encap.dport) ||

	    nla_put_u16(skb, IFLA_IPTUN_ENCAP_FLAGS,

			tunnel->encap.flags))