Subject: netfilter 19/41: nf_conntrack: account packets drop by tcp_packet()

From: Patrick McHardy <[email-masked]>
Date: Tue, 24 Mar 2009 15:03:32 +0100 (MET)

commit 7d1e04598e5e92527840b6889fb75b4b30fdd33b
Author: Pablo Neira Ayuso <[email-masked]>
Date:   Tue Feb 24 14:48:01 2009 +0100

    netfilter: nf_conntrack: account packets drop by tcp_packet()
    
    Since tcp_packet() may return -NF_DROP in two situations, the
    packet-drop stats must be increased.
    
    Signed-off-by: Pablo Neira Ayuso <[email-masked]>
    Signed-off-by: Patrick McHardy <[email-masked]>

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 2235432..ebc2756 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/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;
 	}