diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-12 21:58:40 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-12 21:58:40 -0500 |
| commit | 464143c911df98d4913932534485113a0a14aa74 (patch) | |
| tree | 4df3953e3cbba8931b6305aa6d16981f1a93de6c /net/core | |
| parent | bb1231052e265e960d902ab32e67c5ccdabc9434 (diff) | |
| parent | 2fc72c7b84002ffb3c66918e2a7b0ee607d8b5aa (diff) | |
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) | |||
| 380 | } | 380 | } |
| 381 | #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) | 381 | #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) |
| 382 | nf_conntrack_put(skb->nfct); | 382 | nf_conntrack_put(skb->nfct); |
| 383 | #endif | ||
| 384 | #ifdef NET_SKBUFF_NF_DEFRAG_NEEDED | ||
| 383 | nf_conntrack_put_reasm(skb->nfct_reasm); | 385 | nf_conntrack_put_reasm(skb->nfct_reasm); |
| 384 | #endif | 386 | #endif |
| 385 | #ifdef CONFIG_BRIDGE_NETFILTER | 387 | #ifdef CONFIG_BRIDGE_NETFILTER |