aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/cls_api.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-05-29 05:46:10 -0400
committerTakashi Iwai <tiwai@suse.de>2009-05-29 05:46:10 -0400
commite93721a70263afefbac781f575bfe851c6f95d84 (patch)
treeab359f12a0688802aa99339bae82c51763dae9f6 /net/sched/cls_api.c
parentae1ec5e1e97f67d41e641a73380129e5905e41cc (diff)
parentc87d9732004b3f8fd82d729f12ccfb96c0df279e (diff)
Merge branch 'fix/pcm-jiffies-check' into topic/pcm-jiffies-check
Diffstat (limited to 'net/sched/cls_api.c')
-rw-r--r--net/sched/cls_api.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 173fcc4b050d..0759f32e9dca 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -254,7 +254,7 @@ replay:
254 } 254 }
255 tp->ops = tp_ops; 255 tp->ops = tp_ops;
256 tp->protocol = protocol; 256 tp->protocol = protocol;
257 tp->prio = nprio ? : tcf_auto_prio(*back); 257 tp->prio = nprio ? : TC_H_MAJ(tcf_auto_prio(*back));
258 tp->q = q; 258 tp->q = q;
259 tp->classify = tp_ops->classify; 259 tp->classify = tp_ops->classify;
260 tp->classid = parent; 260 tp->classid = parent;