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

Commit f9ffc312 authored by Patrick McHardy's avatar Patrick McHardy
Browse files

netfilter: fix some sparse endianess warnings 



net/netfilter/xt_NFQUEUE.c:46:9: warning: incorrect type in assignment (different base types)
net/netfilter/xt_NFQUEUE.c:46:9:    expected unsigned int [unsigned] [usertype] ipaddr
net/netfilter/xt_NFQUEUE.c:46:9:    got restricted unsigned int
net/netfilter/xt_NFQUEUE.c:68:10: warning: incorrect type in assignment (different base types)
net/netfilter/xt_NFQUEUE.c:68:10:    expected unsigned int [unsigned] <noident>
net/netfilter/xt_NFQUEUE.c:68:10:    got restricted unsigned int
net/netfilter/xt_NFQUEUE.c:69:10: warning: incorrect type in assignment (different base types)
net/netfilter/xt_NFQUEUE.c:69:10:    expected unsigned int [unsigned] <noident>
net/netfilter/xt_NFQUEUE.c:69:10:    got restricted unsigned int
net/netfilter/xt_NFQUEUE.c:70:10: warning: incorrect type in assignment (different base types)
net/netfilter/xt_NFQUEUE.c:70:10:    expected unsigned int [unsigned] <noident>
net/netfilter/xt_NFQUEUE.c:70:10:    got restricted unsigned int
net/netfilter/xt_NFQUEUE.c:71:10: warning: incorrect type in assignment (different base types)
net/netfilter/xt_NFQUEUE.c:71:10:    expected unsigned int [unsigned] <noident>
net/netfilter/xt_NFQUEUE.c:71:10:    got restricted unsigned int

net/netfilter/xt_cluster.c:20:55: warning: incorrect type in return expression (different base types)
net/netfilter/xt_cluster.c:20:55:    expected unsigned int
net/netfilter/xt_cluster.c:20:55:    got restricted unsigned int const [usertype] ip
net/netfilter/xt_cluster.c:20:55: warning: incorrect type in return expression (different base types)
net/netfilter/xt_cluster.c:20:55:    expected unsigned int
net/netfilter/xt_cluster.c:20:55:    got restricted unsigned int const [usertype] ip

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 8d8890b7

net/netfilter/xt_NFQUEUE.c

+4 −4
Original line number Diff line number Diff line
@@ -40,12 +40,12 @@ nfqueue_tg(struct sk_buff *skb, const struct xt_target_param *par) 
static u32 hash_v4(const struct sk_buff *skb)

{

	const struct iphdr *iph = ip_hdr(skb);

	u32 ipaddr;

	__be32 ipaddr;



	/* packets in either direction go into same queue */

	ipaddr = iph->saddr ^ iph->daddr;



	return jhash_2words(ipaddr, iph->protocol, jhash_initval);

	return jhash_2words((__force u32)ipaddr, iph->protocol, jhash_initval);

}



static unsigned int
@@ -63,14 +63,14 @@ nfqueue_tg4_v1(struct sk_buff *skb, const struct xt_target_param *par) 
static u32 hash_v6(const struct sk_buff *skb)

{

	const struct ipv6hdr *ip6h = ipv6_hdr(skb);

	u32 addr[4];

	__be32 addr[4];



	addr[0] = ip6h->saddr.s6_addr32[0] ^ ip6h->daddr.s6_addr32[0];

	addr[1] = ip6h->saddr.s6_addr32[1] ^ ip6h->daddr.s6_addr32[1];

	addr[2] = ip6h->saddr.s6_addr32[2] ^ ip6h->daddr.s6_addr32[2];

	addr[3] = ip6h->saddr.s6_addr32[3] ^ ip6h->daddr.s6_addr32[3];



	return jhash2(addr, ARRAY_SIZE(addr), jhash_initval);

	return jhash2((__force u32 *)addr, ARRAY_SIZE(addr), jhash_initval);

}



static unsigned int

net/netfilter/xt_cluster.c

+4 −4
Original line number Diff line number Diff line
@@ -15,14 +15,14 @@ 
#include <net/netfilter/nf_conntrack.h>

#include <linux/netfilter/xt_cluster.h>



static inline u_int32_t nf_ct_orig_ipv4_src(const struct nf_conn *ct)

static inline u32 nf_ct_orig_ipv4_src(const struct nf_conn *ct)

{

	return ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;

	return (__force u32)ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;

}



static inline const void *nf_ct_orig_ipv6_src(const struct nf_conn *ct)

static inline const u32 *nf_ct_orig_ipv6_src(const struct nf_conn *ct)

{

	return ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip6;

	return (__force u32 *)ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip6;

}



static inline u_int32_t