Skip to contentSkip to conversation

net sched: make pedit check for clones instead

PATCH Applied jamal 3 participants 3 messages Jun 4, 2010 – Jun 7, 2010

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

jamal

author
#0 lore raw

PATCH 1/1 net sched: make pedit check for clones instead

And here's the second one. I noticed Changli's changes are not yet in net-next. I will wait for that change to propagate and then send the fix to pedit that i discussed with Herbert.

cheers,
jamal

commit 0697bf778d48d155ef48f652cee8f103db3dcedb

Author: Jamal Hadi Salim <[email protected]>
Date:   Fri Jun 4 08:39:47 2010 -0400

net sched: make pedit check for clones instead

Now that the core path doesnt set OK to munge we detect writable skbs by looking to see if they are cloned.

Signed-off-by Jamal Hadi Salim <[email protected]>
net/sched/act_pedit.c +1 -2
index fdbd0b7..8d15caf 100644
@@ -127,8 +127,7 @@ static int tcf_pedit(struct sk_buff *skb, struct tc_action *a,
 	int i, munged = 0;
 	u8 *pptr;
 
-	if (!(skb->tc_verd & TC_OK2MUNGE)) {
-		/* should we set skb->cloned? */
+	if (skb_cloned(skb)) {
 		if (pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) {
 			return p->tcf_action;
 		}
#1 lore raw
Quoted 3 lines · jamal

And here's the second one. I noticed Changli's changes are not yet in net-next. I will wait for that change to propagate and then send the fix to pedit that i discussed with Herbert.

Thanks Jamal!

BTW, I think this patch should go in first (before the one that removes the OK2MUNGE setting) to be on the safe side.

Cheers,

Signature · 4 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
maintainer Applied
#2 lore raw

From: Herbert Xu <[email protected]>
Date: Fri, 4 Jun 2010 23:05:11 +1000

Quoted 9 lines · jamal
Quoted 3 lines

And here's the second one. I noticed Changli's changes are not yet in net-next. I will wait for that change to propagate and then send the fix to pedit that i discussed with Herbert.

Thanks Jamal!

BTW, I think this patch should go in first (before the one that removes the OK2MUNGE setting) to be on the safe side.

I applied them this way to net-next-2.6, thanks!