projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of /repos/git/net-next-2.6
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
net
/
ipv6
/
netfilter
/
nf_conntrack_reasm.c
diff --git
a/net/ipv6/netfilter/nf_conntrack_reasm.c
b/net/ipv6/netfilter/nf_conntrack_reasm.c
index
744ea49
..
ad1fcda
100644
(file)
--- a/
net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/
net/ipv6/netfilter/nf_conntrack_reasm.c
@@
-60,6
+60,7
@@
struct nf_ct_frag6_queue
struct inet_frag_queue q;
__be32 id; /* fragment id */
+ u32 user;
struct in6_addr saddr;
struct in6_addr daddr;