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

Commit 30d3d83a authored by Lance Richardson's avatar Lance Richardson Committed by David S. Miller
Browse files

ipv4: fix endianness warnings in ip_tunnel_core.c 



Eliminate endianness mismatch warnings (reported by sparse) in this file by
using appropriate nla_put_*()/nla_get_*() calls.

Signed-off-by: default avatarLance Richardson <lrichard@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9b59377b

net/ipv4/ip_tunnel_core.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -251,7 +251,7 @@ static int ip_tun_build_state(struct net_device *dev, struct nlattr *attr, 
	tun_info = lwt_tun_info(new_state);

	tun_info = lwt_tun_info(new_state);





	if (tb[LWTUNNEL_IP_ID])

	if (tb[LWTUNNEL_IP_ID])

		tun_info->key.tun_id = nla_get_u64(tb[LWTUNNEL_IP_ID]);

		tun_info->key.tun_id = nla_get_be64(tb[LWTUNNEL_IP_ID]);





	if (tb[LWTUNNEL_IP_DST])

	if (tb[LWTUNNEL_IP_DST])

		tun_info->key.u.ipv4.dst = nla_get_be32(tb[LWTUNNEL_IP_DST]);

		tun_info->key.u.ipv4.dst = nla_get_be32(tb[LWTUNNEL_IP_DST]);
@@ -266,7 +266,7 @@ static int ip_tun_build_state(struct net_device *dev, struct nlattr *attr, 
		tun_info->key.tos = nla_get_u8(tb[LWTUNNEL_IP_TOS]);

		tun_info->key.tos = nla_get_u8(tb[LWTUNNEL_IP_TOS]);





	if (tb[LWTUNNEL_IP_FLAGS])

	if (tb[LWTUNNEL_IP_FLAGS])

		tun_info->key.tun_flags = nla_get_u16(tb[LWTUNNEL_IP_FLAGS]);

		tun_info->key.tun_flags = nla_get_be16(tb[LWTUNNEL_IP_FLAGS]);





	tun_info->mode = IP_TUNNEL_INFO_TX;

	tun_info->mode = IP_TUNNEL_INFO_TX;

	tun_info->options_len = 0;

	tun_info->options_len = 0;
@@ -281,12 +281,12 @@ static int ip_tun_fill_encap_info(struct sk_buff *skb, 
{

{

	struct ip_tunnel_info *tun_info = lwt_tun_info(lwtstate);

	struct ip_tunnel_info *tun_info = lwt_tun_info(lwtstate);





	if (nla_put_u64(skb, LWTUNNEL_IP_ID, tun_info->key.tun_id) ||

	if (nla_put_be64(skb, LWTUNNEL_IP_ID, tun_info->key.tun_id) ||

	    nla_put_be32(skb, LWTUNNEL_IP_DST, tun_info->key.u.ipv4.dst) ||

	    nla_put_be32(skb, LWTUNNEL_IP_DST, tun_info->key.u.ipv4.dst) ||

	    nla_put_be32(skb, LWTUNNEL_IP_SRC, tun_info->key.u.ipv4.src) ||

	    nla_put_be32(skb, LWTUNNEL_IP_SRC, tun_info->key.u.ipv4.src) ||

	    nla_put_u8(skb, LWTUNNEL_IP_TOS, tun_info->key.tos) ||

	    nla_put_u8(skb, LWTUNNEL_IP_TOS, tun_info->key.tos) ||

	    nla_put_u8(skb, LWTUNNEL_IP_TTL, tun_info->key.ttl) ||

	    nla_put_u8(skb, LWTUNNEL_IP_TTL, tun_info->key.ttl) ||

	    nla_put_u16(skb, LWTUNNEL_IP_FLAGS, tun_info->key.tun_flags))

	    nla_put_be16(skb, LWTUNNEL_IP_FLAGS, tun_info->key.tun_flags))

		return -ENOMEM;

		return -ENOMEM;





	return 0;

	return 0;
@@ -346,7 +346,7 @@ static int ip6_tun_build_state(struct net_device *dev, struct nlattr *attr, 
	tun_info = lwt_tun_info(new_state);

	tun_info = lwt_tun_info(new_state);





	if (tb[LWTUNNEL_IP6_ID])

	if (tb[LWTUNNEL_IP6_ID])

		tun_info->key.tun_id = nla_get_u64(tb[LWTUNNEL_IP6_ID]);

		tun_info->key.tun_id = nla_get_be64(tb[LWTUNNEL_IP6_ID]);





	if (tb[LWTUNNEL_IP6_DST])

	if (tb[LWTUNNEL_IP6_DST])

		tun_info->key.u.ipv6.dst = nla_get_in6_addr(tb[LWTUNNEL_IP6_DST]);

		tun_info->key.u.ipv6.dst = nla_get_in6_addr(tb[LWTUNNEL_IP6_DST]);
@@ -361,7 +361,7 @@ static int ip6_tun_build_state(struct net_device *dev, struct nlattr *attr, 
		tun_info->key.tos = nla_get_u8(tb[LWTUNNEL_IP6_TC]);

		tun_info->key.tos = nla_get_u8(tb[LWTUNNEL_IP6_TC]);





	if (tb[LWTUNNEL_IP6_FLAGS])

	if (tb[LWTUNNEL_IP6_FLAGS])

		tun_info->key.tun_flags = nla_get_u16(tb[LWTUNNEL_IP6_FLAGS]);

		tun_info->key.tun_flags = nla_get_be16(tb[LWTUNNEL_IP6_FLAGS]);





	tun_info->mode = IP_TUNNEL_INFO_TX | IP_TUNNEL_INFO_IPV6;

	tun_info->mode = IP_TUNNEL_INFO_TX | IP_TUNNEL_INFO_IPV6;

	tun_info->options_len = 0;

	tun_info->options_len = 0;
@@ -376,12 +376,12 @@ static int ip6_tun_fill_encap_info(struct sk_buff *skb, 
{

{

	struct ip_tunnel_info *tun_info = lwt_tun_info(lwtstate);

	struct ip_tunnel_info *tun_info = lwt_tun_info(lwtstate);





	if (nla_put_u64(skb, LWTUNNEL_IP6_ID, tun_info->key.tun_id) ||

	if (nla_put_be64(skb, LWTUNNEL_IP6_ID, tun_info->key.tun_id) ||

	    nla_put_in6_addr(skb, LWTUNNEL_IP6_DST, &tun_info->key.u.ipv6.dst) ||

	    nla_put_in6_addr(skb, LWTUNNEL_IP6_DST, &tun_info->key.u.ipv6.dst) ||

	    nla_put_in6_addr(skb, LWTUNNEL_IP6_SRC, &tun_info->key.u.ipv6.src) ||

	    nla_put_in6_addr(skb, LWTUNNEL_IP6_SRC, &tun_info->key.u.ipv6.src) ||

	    nla_put_u8(skb, LWTUNNEL_IP6_HOPLIMIT, tun_info->key.tos) ||

	    nla_put_u8(skb, LWTUNNEL_IP6_HOPLIMIT, tun_info->key.tos) ||

	    nla_put_u8(skb, LWTUNNEL_IP6_TC, tun_info->key.ttl) ||

	    nla_put_u8(skb, LWTUNNEL_IP6_TC, tun_info->key.ttl) ||

	    nla_put_u16(skb, LWTUNNEL_IP6_FLAGS, tun_info->key.tun_flags))

	    nla_put_be16(skb, LWTUNNEL_IP6_FLAGS, tun_info->key.tun_flags))

		return -ENOMEM;

		return -ENOMEM;





	return 0;

	return 0;