diff options
| author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2006-02-19 22:32:06 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-02-19 22:32:06 -0800 |
| commit | a8372f035aa2f6717123eb30679a08b619321dd4 (patch) | |
| tree | 8f4980a847ba961513340ac4200a1a918773c0a9 /net | |
| parent | 8e249f088131cde5f77fd073bf0b0e8b3e9ea4ac (diff) | |
| download | op-kernel-dev-a8372f035aa2f6717123eb30679a08b619321dd4.zip op-kernel-dev-a8372f035aa2f6717123eb30679a08b619321dd4.tar.gz | |
[NET]: NETFILTER: remove duplicated lines and fix order in skb_clone().
Some of netfilter-related members are initalized / copied twice in
skb_clone(). Remove one.
Pointed out by Olivier MATZ <olivier.matz@6wind.com>.
And this patch also fixes order of copying / clearing members.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -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 6766f11..2144952 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); |
