diff options
author | Jarek Poplawski <jarkao2@gmail.com> | 2010-08-10 18:31:02 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-08-11 04:36:59 -0400 |
commit | 41065fba846e795b31b17e4dec01cb904d56c6cd (patch) | |
tree | fbe25b8223c1fe8d2abc1e21cb4eb37fdb5ed7dc /net/sched | |
parent | 98a21ef0abb666eeb12cf67e60203befb07e4210 (diff) |
pkt_sched: Fix sch_sfq vs tc_modify_qdisc oops
sch_sfq as a classful qdisc needs the .leaf handler. Otherwise, there
is an oops possible in tc_modify_qdisc()/check_loop().
Fixes commit 7d2681a6ff4f9ab5e48d02550b4c6338f1638998
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
-rw-r--r-- | net/sched/sch_sfq.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c index b8bcb2096df8..201cbac2b32c 100644 --- a/net/sched/sch_sfq.c +++ b/net/sched/sch_sfq.c | |||
@@ -508,6 +508,11 @@ nla_put_failure: | |||
508 | return -1; | 508 | return -1; |
509 | } | 509 | } |
510 | 510 | ||
511 | static struct Qdisc *sfq_leaf(struct Qdisc *sch, unsigned long arg) | ||
512 | { | ||
513 | return NULL; | ||
514 | } | ||
515 | |||
511 | static unsigned long sfq_get(struct Qdisc *sch, u32 classid) | 516 | static unsigned long sfq_get(struct Qdisc *sch, u32 classid) |
512 | { | 517 | { |
513 | return 0; | 518 | return 0; |
@@ -575,6 +580,7 @@ static void sfq_walk(struct Qdisc *sch, struct qdisc_walker *arg) | |||
575 | } | 580 | } |
576 | 581 | ||
577 | static const struct Qdisc_class_ops sfq_class_ops = { | 582 | static const struct Qdisc_class_ops sfq_class_ops = { |
583 | .leaf = sfq_leaf, | ||
578 | .get = sfq_get, | 584 | .get = sfq_get, |
579 | .put = sfq_put, | 585 | .put = sfq_put, |
580 | .tcf_chain = sfq_find_tcf, | 586 | .tcf_chain = sfq_find_tcf, |