Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8372f03 authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by David S. Miller
Browse files

[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: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8e249f08

net/core/skbuff.c

+3 −7
Original line number Diff line number Diff line
@@ -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);