Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6 (ae093577) · Commits · e / devices / android_kernel_fairphone_FP4

net/netfilter/nf_conntrack_core.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -942,8 +942,15 @@ nf_conntrack_in(struct net *net, u_int8_t pf, unsigned int hooknum,
		if (set_reply && !test_and_set_bit(IPS_SEEN_REPLY_BIT, &ct->status))
		nf_conntrack_event_cache(IPCT_REPLY, ct);
		out:
		if (tmpl)
		if (tmpl) {
		/* Special case: we have to repeat this hook, assign the
		* template again to this packet. We assume that this packet
		* has no conntrack assigned. This is used by nf_ct_tcp. */
		if (ret == NF_REPEAT)
		skb->nfct = (struct nf_conntrack *)tmpl;
		else
		nf_ct_put(tmpl);
		}

		return ret;
		}