diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-02-24 03:16:27 +0100 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-02-24 03:16:27 +0100 |
commit | 7b0386921db20add25afd8678ed34a9253e512fc (patch) | |
tree | 8c6b888b76211e38e6c1c3006553dc4b2b24c75e /net/core | |
parent | Merge branch 'forcedeth' (diff) | |
parent | Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux... (diff) | |
download | linux-7b0386921db20add25afd8678ed34a9253e512fc.tar.xz linux-7b0386921db20add25afd8678ed34a9253e512fc.zip |
Merge branch 'upstream-fixes'
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/skbuff.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 6766f118f070..2144952d1c6c 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -411,6 +411,9 @@ struct sk_buff *skb_clone(struct sk_buff *skb, gfp_t gfp_mask) C(pkt_type); C(ip_summed); C(priority); +#if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE) + C(ipvs_property); +#endif C(protocol); n->destructor = NULL; #ifdef CONFIG_NETFILTER @@ -422,13 +425,6 @@ struct sk_buff *skb_clone(struct sk_buff *skb, gfp_t gfp_mask) C(nfct_reasm); nf_conntrack_get_reasm(skb->nfct_reasm); #endif -#if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE) - C(ipvs_property); -#endif -#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) - C(nfct_reasm); - nf_conntrack_get_reasm(skb->nfct_reasm); -#endif #ifdef CONFIG_BRIDGE_NETFILTER C(nf_bridge); nf_bridge_get(skb->nf_bridge); |