diff options
| author | Jamal Hadi Salim <hadi@cyberus.ca> | 2007-10-26 02:47:54 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-10-26 02:47:54 -0700 |
| commit | a057ae3c104dd2c661e55d2af37e70d168c65e00 (patch) | |
| tree | 5efaef5d891f64c8de7d5dde0f61c9d6d0e9e243 /net | |
| parent | 12da81d11a34d3bdef52d731cc75f7ec72d0e815 (diff) | |
| download | blackbird-op-linux-a057ae3c104dd2c661e55d2af37e70d168c65e00.tar.gz blackbird-op-linux-a057ae3c104dd2c661e55d2af37e70d168c65e00.zip | |
[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: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -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) 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/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: 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 && |
