From: David S. Miller <davem@davemloft.net>
Date: Fri, 12 Nov 2010 19:04:26 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=7c13a0d9a1ac6875f6380763b947f4a5a016605f;hp=369cf77a6a3e41b1110506ddf43d45804103bfde;p=net-next-2.6.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
---

diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index 89341c32631..03317c8d407 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -215,7 +215,7 @@ NF_HOOK_COND(uint8_t pf, unsigned int hook, struct sk_buff *skb,
 	int ret;
 
 	if (!cond ||
-	    (ret = nf_hook_thresh(pf, hook, skb, in, out, okfn, INT_MIN) == 1))
+	    ((ret = nf_hook_thresh(pf, hook, skb, in, out, okfn, INT_MIN)) == 1))
 		ret = okfn(skb);
 	return ret;
 }
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index 3a3f129a44c..79d43aa8fa8 100644
--- 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. */