projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NetLabel: add tag verification when adding new CIPSOv4 DOI definitions
[powerpc.git]
/
net
/
ipv4
/
ip_fragment.c
diff --git
a/net/ipv4/ip_fragment.c
b/net/ipv4/ip_fragment.c
index
165d728
..
74046ef
100644
(file)
--- a/
net/ipv4/ip_fragment.c
+++ b/
net/ipv4/ip_fragment.c
@@
-77,9
+77,9
@@
struct ipq {
struct hlist_node list;
struct list_head lru_list; /* lru list member */
u32 user;
struct hlist_node list;
struct list_head lru_list; /* lru list member */
u32 user;
-
u32
saddr;
-
u32
daddr;
-
u16
id;
+
__be32
saddr;
+
__be32
daddr;
+
__be16
id;
u8 protocol;
u8 last_in;
#define COMPLETE 4
u8 protocol;
u8 last_in;
#define COMPLETE 4
@@
-123,9
+123,10
@@
static __inline__ void ipq_unlink(struct ipq *ipq)
write_unlock(&ipfrag_lock);
}
write_unlock(&ipfrag_lock);
}
-static unsigned int ipqhashfn(
u16 id, u32 saddr, u
32 daddr, u8 prot)
+static unsigned int ipqhashfn(
__be16 id, __be32 saddr, __be
32 daddr, u8 prot)
{
{
- return jhash_3words((u32)id << 16 | prot, saddr, daddr,
+ return jhash_3words((__force u32)id << 16 | prot,
+ (__force u32)saddr, (__force u32)daddr,
ipfrag_hash_rnd) & (IPQ_HASHSZ - 1);
}
ipfrag_hash_rnd) & (IPQ_HASHSZ - 1);
}
@@
-387,8
+388,8
@@
out_nomem:
static inline struct ipq *ip_find(struct iphdr *iph, u32 user)
{
__be16 id = iph->id;
static inline struct ipq *ip_find(struct iphdr *iph, u32 user)
{
__be16 id = iph->id;
- __
u
32 saddr = iph->saddr;
- __
u
32 daddr = iph->daddr;
+ __
be
32 saddr = iph->saddr;
+ __
be
32 daddr = iph->daddr;
__u8 protocol = iph->protocol;
unsigned int hash;
struct ipq *qp;
__u8 protocol = iph->protocol;
unsigned int hash;
struct ipq *qp;