diff options
Diffstat (limited to 'net/netfilter/xt_NFQUEUE.c')
-rw-r--r-- | net/netfilter/xt_NFQUEUE.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/netfilter/xt_NFQUEUE.c b/net/netfilter/xt_NFQUEUE.c index 7babe7d6871..817f9e9f2b1 100644 --- a/net/netfilter/xt_NFQUEUE.c +++ b/net/netfilter/xt_NFQUEUE.c | |||
@@ -43,7 +43,7 @@ static u32 hash_v4(const struct sk_buff *skb) | |||
43 | const struct iphdr *iph = ip_hdr(skb); | 43 | const struct iphdr *iph = ip_hdr(skb); |
44 | 44 | ||
45 | /* packets in either direction go into same queue */ | 45 | /* packets in either direction go into same queue */ |
46 | if (iph->saddr < iph->daddr) | 46 | if ((__force u32)iph->saddr < (__force u32)iph->daddr) |
47 | return jhash_3words((__force u32)iph->saddr, | 47 | return jhash_3words((__force u32)iph->saddr, |
48 | (__force u32)iph->daddr, iph->protocol, jhash_initval); | 48 | (__force u32)iph->daddr, iph->protocol, jhash_initval); |
49 | 49 | ||
@@ -57,7 +57,8 @@ static u32 hash_v6(const struct sk_buff *skb) | |||
57 | const struct ipv6hdr *ip6h = ipv6_hdr(skb); | 57 | const struct ipv6hdr *ip6h = ipv6_hdr(skb); |
58 | u32 a, b, c; | 58 | u32 a, b, c; |
59 | 59 | ||
60 | if (ip6h->saddr.s6_addr32[3] < ip6h->daddr.s6_addr32[3]) { | 60 | if ((__force u32)ip6h->saddr.s6_addr32[3] < |
61 | (__force u32)ip6h->daddr.s6_addr32[3]) { | ||
61 | a = (__force u32) ip6h->saddr.s6_addr32[3]; | 62 | a = (__force u32) ip6h->saddr.s6_addr32[3]; |
62 | b = (__force u32) ip6h->daddr.s6_addr32[3]; | 63 | b = (__force u32) ip6h->daddr.s6_addr32[3]; |
63 | } else { | 64 | } else { |
@@ -65,7 +66,8 @@ static u32 hash_v6(const struct sk_buff *skb) | |||
65 | a = (__force u32) ip6h->daddr.s6_addr32[3]; | 66 | a = (__force u32) ip6h->daddr.s6_addr32[3]; |
66 | } | 67 | } |
67 | 68 | ||
68 | if (ip6h->saddr.s6_addr32[1] < ip6h->daddr.s6_addr32[1]) | 69 | if ((__force u32)ip6h->saddr.s6_addr32[1] < |
70 | (__force u32)ip6h->daddr.s6_addr32[1]) | ||
69 | c = (__force u32) ip6h->saddr.s6_addr32[1]; | 71 | c = (__force u32) ip6h->saddr.s6_addr32[1]; |
70 | else | 72 | else |
71 | c = (__force u32) ip6h->daddr.s6_addr32[1]; | 73 | c = (__force u32) ip6h->daddr.s6_addr32[1]; |