From fffa73c3d087a036e4dedc65490de74481348c5c Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 24 Feb 2009 14:48:01 +0100 Subject: [PATCH] --- yaml --- r: 135485 b: refs/heads/master c: 7d1e04598e5e92527840b6889fb75b4b30fdd33b h: refs/heads/master i: 135483: 1b2d18894d29564bd5c3ccba28c7f2380287178f v: v3 --- [refs] | 2 +- trunk/net/netfilter/nf_conntrack_core.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5e4c268ea6b7..f8b6cb9e6bd1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08361aa807ae5e5007cd226ca9e34287512de737 +refs/heads/master: 7d1e04598e5e92527840b6889fb75b4b30fdd33b diff --git a/trunk/net/netfilter/nf_conntrack_core.c b/trunk/net/netfilter/nf_conntrack_core.c index 2235432c59d1..ebc275600125 100644 --- a/trunk/net/netfilter/nf_conntrack_core.c +++ b/trunk/net/netfilter/nf_conntrack_core.c @@ -734,6 +734,8 @@ nf_conntrack_in(struct net *net, u_int8_t pf, unsigned int hooknum, nf_conntrack_put(skb->nfct); skb->nfct = NULL; NF_CT_STAT_INC_ATOMIC(net, invalid); + if (ret == -NF_DROP) + NF_CT_STAT_INC_ATOMIC(net, drop); return -ret; }