From 79597375935523268e7dc2d04a161de9bdaf9887 Mon Sep 17 00:00:00 2001 From: Jamal Hadi Salim Date: Fri, 26 Oct 2007 02:47:54 -0700 Subject: [PATCH] --- yaml --- r: 72607 b: refs/heads/master c: a057ae3c104dd2c661e55d2af37e70d168c65e00 h: refs/heads/master i: 72605: 0283d8b08d0b7220d7bf6af9f6b5f77fd6084d6f 72603: e0f1a4e63c839a96938d65d7aaadeb91d46e5c77 72599: 5027b59c54cc1b680c7cfddc90dbcafe878a5b12 72591: 3326aec0e7965ecada4811b91c09ee46244c972d 72575: 2fc1927f5437e162942886a54400af42a2de8f57 v: v3 --- [refs] | 2 +- trunk/net/core/skbuff.c | 7 ------- trunk/net/sched/act_mirred.c | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 1b820aff3f8f..50c1618a911f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12da81d11a34d3bdef52d731cc75f7ec72d0e815 +refs/heads/master: a057ae3c104dd2c661e55d2af37e70d168c65e00 diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c index 7b7c6c44c2da..573e17240197 100644 --- a/trunk/net/core/skbuff.c +++ b/trunk/net/core/skbuff.c @@ -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); diff --git a/trunk/net/sched/act_mirred.c b/trunk/net/sched/act_mirred.c index fd7bca4d5c20..c3fde9180f9d 100644 --- a/trunk/net/sched/act_mirred.c +++ b/trunk/net/sched/act_mirred.c @@ -166,7 +166,7 @@ static int tcf_mirred(struct sk_buff *skb, struct tc_action *a, 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 &&