X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=net%2Fsched%2Fcls_u32.c;h=bfe785eb0f573f67aac799d8e899c57ddc88c792;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=30d26d4fe34a90b43fa8bd1fcb4635d7d8d4723b;hpb=a2c21200f1c81b08cb55e417b68150bba439b646;p=linux-2.6.git

diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index 30d26d4fe..bfe785eb0 100644
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -175,12 +175,7 @@ check_terminal:
 #endif
 #ifdef CONFIG_NET_CLS_ACT
 				if (n->action) {
-					int pol_res = tcf_action_exec(skb, n->action);
-					if (skb->tc_classid > 0) {
-						res->classid = skb->tc_classid;
-						skb->tc_classid = 0;
-					}
-
+					int pol_res = tcf_action_exec(skb, n->action, res);
 					if (pol_res >= 0)
 						return pol_res;
 				} else