lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NET_CLS_ACT]: Use skb_act_clone

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

Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jamal Hadi Salim
2007-10-26 02:47:54 -07:00
committed by David S. Miller
parent 12da81d11a
commit a057ae3c10
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/core/skbuff.c
View File

@@ -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->hdr_len = skb->nohdr ? skb_headroom(skb) : skb->hdr_len;
n->nohdr = 0; n->nohdr = 0;
n->destructor = NULL; 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); C(truesize);
atomic_set(&n->users, 1); atomic_set(&n->users, 1);
C(head); C(head);

2
net/sched/act_mirred.c
View File

@@ -166,7 +166,7 @@ bad_mirred:
return TC_ACT_SHOT; return TC_ACT_SHOT;
} }
skb2 = skb_clone(skb, GFP_ATOMIC); skb2 = skb_act_clone(skb, GFP_ATOMIC);
if (skb2 == NULL) if (skb2 == NULL)
goto bad_mirred; goto bad_mirred;
if (m->tcfm_eaction != TCA_EGRESS_MIRROR && if (m->tcfm_eaction != TCA_EGRESS_MIRROR &&