diff options
| author | David S. Miller | 2011-01-13 03:58:40 +0100 |
|---|---|---|
| committer | David S. Miller | 2011-01-13 03:58:40 +0100 |
| commit | 464143c911df98d4913932534485113a0a14aa74 (patch) | |
| tree | 4df3953e3cbba8931b6305aa6d16981f1a93de6c /net/core | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| parent | netfilter: fix compilation when conntrack is disabled but tproxy is enabled (diff) | |
| download | kernel-qcow2-linux-464143c911df98d4913932534485113a0a14aa74.tar.gz kernel-qcow2-linux-464143c911df98d4913932534485113a0a14aa74.tar.xz kernel-qcow2-linux-464143c911df98d4913932534485113a0a14aa74.zip | |
Merge branch 'master' of git://1984.lsi.us.es/net-2.6
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/skbuff.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 19d6c21220fd..d31bb36ae0dc 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 |