diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-04-20 19:06:52 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-20 19:06:52 -0700 |
| commit | 0eae88f31ca2b88911ce843452054139e028771f (patch) | |
| tree | 90f50197d8e1e50e3621e9c525bd4ca2634fe368 /net/ipv4/af_inet.c | |
| parent | cb903bf4ee2d6e53210e2174d363e10698112042 (diff) | |
| download | linux-3.10-0eae88f31ca2b88911ce843452054139e028771f.tar.gz linux-3.10-0eae88f31ca2b88911ce843452054139e028771f.tar.bz2 linux-3.10-0eae88f31ca2b88911ce843452054139e028771f.zip | |
net: Fix various endianness glitches
Sparse can help us find endianness bugs, but we need to make some
cleanups to be able to more easily spot real bugs.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/af_inet.c')
| -rw-r--r-- | net/ipv4/af_inet.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 5ca7290c2e6..9f52880fae1 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1323,8 +1323,8 @@ static struct sk_buff **inet_gro_receive(struct sk_buff **head, if (unlikely(ip_fast_csum((u8 *)iph, iph->ihl))) goto out_unlock; - id = ntohl(*(u32 *)&iph->id); - flush = (u16)((ntohl(*(u32 *)iph) ^ skb_gro_len(skb)) | (id ^ IP_DF)); + id = ntohl(*(__be32 *)&iph->id); + flush = (u16)((ntohl(*(__be32 *)iph) ^ skb_gro_len(skb)) | (id ^ IP_DF)); id >>= 16; for (p = *head; p; p = p->next) { @@ -1337,8 +1337,8 @@ static struct sk_buff **inet_gro_receive(struct sk_buff **head, if ((iph->protocol ^ iph2->protocol) | (iph->tos ^ iph2->tos) | - (iph->saddr ^ iph2->saddr) | - (iph->daddr ^ iph2->daddr)) { + ((__force u32)iph->saddr ^ (__force u32)iph2->saddr) | + ((__force u32)iph->daddr ^ (__force u32)iph2->daddr)) { NAPI_GRO_CB(p)->same_flow = 0; continue; } |