summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-01-12 18:58:40 -0800
committerDavid S. Miller <davem@davemloft.net>2011-01-12 18:58:40 -0800
commit464143c911df98d4913932534485113a0a14aa74 (patch)
tree4df3953e3cbba8931b6305aa6d16981f1a93de6c /net/core
parentbb1231052e265e960d902ab32e67c5ccdabc9434 (diff)
parent2fc72c7b84002ffb3c66918e2a7b0ee607d8b5aa (diff)
downloadop-kernel-dev-464143c911df98d4913932534485113a0a14aa74.zip
op-kernel-dev-464143c911df98d4913932534485113a0a14aa74.tar.gz
Merge branch 'master' of git://1984.lsi.us.es/net-2.6
Diffstat (limited to 'net/core')
-rw-r--r--net/core/skbuff.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 19d6c21..d31bb36 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -380,6 +380,8 @@ static void skb_release_head_state(struct sk_buff *skb)
}
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
nf_conntrack_put(skb->nfct);
+#endif
+#ifdef NET_SKBUFF_NF_DEFRAG_NEEDED
nf_conntrack_put_reasm(skb->nfct_reasm);
#endif
#ifdef CONFIG_BRIDGE_NETFILTER
OpenPOWER on IntegriCloud