diff options
-rw-r--r-- | net/core/skbuff.c | 7 | ||||
-rw-r--r-- | net/sched/act_mirred.c | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 7b7c6c44c2da..573e17240197 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
@@ -415,13 +415,6 @@ static struct sk_buff *__skb_clone(struct sk_buff *n, struct sk_buff *skb) | |||
415 | n->hdr_len = skb->nohdr ? skb_headroom(skb) : skb->hdr_len; | 415 | n->hdr_len = skb->nohdr ? skb_headroom(skb) : skb->hdr_len; |
416 | n->nohdr = 0; | 416 | n->nohdr = 0; |
417 | n->destructor = NULL; | 417 | n->destructor = NULL; |
418 | #ifdef CONFIG_NET_CLS_ACT | ||
419 | /* FIXME What is this and why don't we do it in copy_skb_header? */ | ||
420 | n->tc_verd = SET_TC_VERD(n->tc_verd,0); | ||
421 | n->tc_verd = CLR_TC_OK2MUNGE(n->tc_verd); | ||
422 | n->tc_verd = CLR_TC_MUNGED(n->tc_verd); | ||
423 | C(iif); | ||
424 | #endif | ||
425 | C(truesize); | 418 | C(truesize); |
426 | atomic_set(&n->users, 1); | 419 | atomic_set(&n->users, 1); |
427 | C(head); | 420 | C(head); |
diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c index fd7bca4d5c20..c3fde9180f9d 100644 --- a/net/sched/act_mirred.c +++ b/net/sched/act_mirred.c | |||
@@ -166,7 +166,7 @@ bad_mirred: | |||
166 | return TC_ACT_SHOT; | 166 | return TC_ACT_SHOT; |
167 | } | 167 | } |
168 | 168 | ||
169 | skb2 = skb_clone(skb, GFP_ATOMIC); | 169 | skb2 = skb_act_clone(skb, GFP_ATOMIC); |
170 | if (skb2 == NULL) | 170 | if (skb2 == NULL) |
171 | goto bad_mirred; | 171 | goto bad_mirred; |
172 | if (m->tcfm_eaction != TCA_EGRESS_MIRROR && | 172 | if (m->tcfm_eaction != TCA_EGRESS_MIRROR && |