Skip to contentSkip to conversation

Use skb_act_clone

PATCH Applied jamal 2 participants 2 messages Oct 21, 2007 – Oct 26, 2007

Subsystems (3)
Networking Network drivers Traffic control (tc)
lore
Share & tools
lore

jamal

author
#0 lore raw

PATCH 2/3 Use skb_act_clone

A resubmit against net-2.6 from about an hour ago.

cheers,
jamal

Quoted 1 line

From 92df260fb3e72cd7298a0994fa930a7af60ab3d0 Mon Sep 17 00:00:00 2001

From: Jamal Hadi Salim <[email protected]>
Date: Sun, 21 Oct 2007 15:02:41 -0400
Subject: [PATCH 2/3] [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 <[email protected]>
---
 net/core/skbuff.c      |    7 -------
 net/sched/act_mirred.c |    2 +-
 2 files changed, 1 insertions(+), 8 deletions(-)
net/core/skbuff.c +0 -7
index 70d9b5d..593a8da 100644
@@ -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
index fd7bca4..c3fde91 100644
@@ -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 &&
Signature · 1 line
1.4.4.1.gaed4
maintainer Applied
#1 lore raw

From: jamal <[email protected]>
Date: Sun, 21 Oct 2007 15:20:20 -0400

Quoted 1 line

A resubmit against net-2.6 from about an hour ago.

Applied.