diff options
author | Patrick McHardy <kaber@trash.net> | 2009-09-04 02:41:16 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-06 05:07:02 -0400 |
commit | de6d5cdf881353f83006d5f3e28ac4fffd42145e (patch) | |
tree | edc032e4d0a868578780facdd28fb0ee277aadc3 /net/sched/sch_tbf.c | |
parent | 71ebe5e91947392bc276af713827eab12b6db8e4 (diff) |
net_sched: make cls_ops->change and cls_ops->delete optional
Some schedulers don't support creating, changing or deleting classes.
Make the respective callbacks optionally and consistently return
-EOPNOTSUPP for unsupported operations, instead of currently either
-EOPNOTSUPP, -ENOSYS or no error.
In case of sch_prio and sch_multiq, the removed operations additionally
checked for an invalid class. This is not necessary since the class
argument can only orginate from ->get() or in case of ->change is 0
for creation of new classes, in which case ->change() incorrectly
returned -ENOENT.
As a side-effect, this patch fixes a possible (root-only) NULL pointer
function call in sch_ingress, which didn't implement a so far mandatory
->delete() operation.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_tbf.c')
-rw-r--r-- | net/sched/sch_tbf.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c index 28909699d24d..d904167e73b3 100644 --- a/net/sched/sch_tbf.c +++ b/net/sched/sch_tbf.c | |||
@@ -410,17 +410,6 @@ static void tbf_put(struct Qdisc *sch, unsigned long arg) | |||
410 | { | 410 | { |
411 | } | 411 | } |
412 | 412 | ||
413 | static int tbf_change_class(struct Qdisc *sch, u32 classid, u32 parentid, | ||
414 | struct nlattr **tca, unsigned long *arg) | ||
415 | { | ||
416 | return -ENOSYS; | ||
417 | } | ||
418 | |||
419 | static int tbf_delete(struct Qdisc *sch, unsigned long arg) | ||
420 | { | ||
421 | return -ENOSYS; | ||
422 | } | ||
423 | |||
424 | static void tbf_walk(struct Qdisc *sch, struct qdisc_walker *walker) | 413 | static void tbf_walk(struct Qdisc *sch, struct qdisc_walker *walker) |
425 | { | 414 | { |
426 | if (!walker->stop) { | 415 | if (!walker->stop) { |
@@ -439,8 +428,6 @@ static const struct Qdisc_class_ops tbf_class_ops = | |||
439 | .leaf = tbf_leaf, | 428 | .leaf = tbf_leaf, |
440 | .get = tbf_get, | 429 | .get = tbf_get, |
441 | .put = tbf_put, | 430 | .put = tbf_put, |
442 | .change = tbf_change_class, | ||
443 | .delete = tbf_delete, | ||
444 | .walk = tbf_walk, | 431 | .walk = tbf_walk, |
445 | .dump = tbf_dump_class, | 432 | .dump = tbf_dump_class, |
446 | }; | 433 | }; |