Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c13a0d9 authored by David S. Miller's avatar David S. Miller
Browse files

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

parents 369cf77a 22e091e5

include/linux/netfilter.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

net/ipv6/netfilter/nf_conntrack_reasm.c

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static int nf_ct_frag6_queue(struct nf_ct_frag6_queue *fq, struct sk_buff *skb, 


	/* 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. */