projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
[cascardo/linux.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
3a3f129
..
79d43aa
100644
(file)
--- a/
net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/
net/ipv6/netfilter/nf_conntrack_reasm.c
@@
-286,7
+286,7
@@
found:
/* Check for overlap with preceding fragment. */
if (prev &&
- (NFCT_FRAG6_CB(prev)->offset + prev->len)
- offset > 0
)
+ (NFCT_FRAG6_CB(prev)->offset + prev->len)
> offset
)
goto discard_fq;
/* Look for overlap with succeeding segment. */