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

Commit a057ae3c authored by Jamal Hadi Salim's avatar Jamal Hadi Salim Committed by David S. Miller
Browse files

[NET_CLS_ACT]: Use skb_act_clone 



clean skb_clone of any signs of CONFIG_NET_CLS_ACT and
have mirred us skb_act_clone()

Signed-off-by: default avatarJamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 12da81d1

net/core/skbuff.c

+0 −7
Original line number Diff line number Diff line
@@ -415,13 +415,6 @@ static struct sk_buff *__skb_clone(struct sk_buff *n, struct sk_buff *skb) 
	n->hdr_len = skb->nohdr ? skb_headroom(skb) : skb->hdr_len;

	n->nohdr = 0;

	n->destructor = NULL;

#ifdef CONFIG_NET_CLS_ACT

	/* FIXME What is this and why don't we do it in copy_skb_header? */

	n->tc_verd = SET_TC_VERD(n->tc_verd,0);

	n->tc_verd = CLR_TC_OK2MUNGE(n->tc_verd);

	n->tc_verd = CLR_TC_MUNGED(n->tc_verd);

	C(iif);

#endif

	C(truesize);

	atomic_set(&n->users, 1);

	C(head);

net/sched/act_mirred.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ bad_mirred: 
		return TC_ACT_SHOT;

	}



	skb2 = skb_clone(skb, GFP_ATOMIC);

	skb2 = skb_act_clone(skb, GFP_ATOMIC);

	if (skb2 == NULL)

		goto bad_mirred;

	if (m->tcfm_eaction != TCA_EGRESS_MIRROR &&