git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
net
/
sched
/
cls_u32.c
diff --git
a/net/sched/cls_u32.c
b/net/sched/cls_u32.c
index
30d26d4
..
bfe785e
100644
(file)
--- 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) {
#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
if (pol_res >= 0)
return pol_res;
} else