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_red.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_red.c')
-rw-r--r-- | net/sched/sch_red.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c index c27b8023f079..a2c4d1aa3cb1 100644 --- a/net/sched/sch_red.c +++ b/net/sched/sch_red.c | |||
@@ -308,17 +308,6 @@ static void red_put(struct Qdisc *sch, unsigned long arg) | |||
308 | return; | 308 | return; |
309 | } | 309 | } |
310 | 310 | ||
311 | static int red_change_class(struct Qdisc *sch, u32 classid, u32 parentid, | ||
312 | struct nlattr **tca, unsigned long *arg) | ||
313 | { | ||
314 | return -ENOSYS; | ||
315 | } | ||
316 | |||
317 | static int red_delete(struct Qdisc *sch, unsigned long cl) | ||
318 | { | ||
319 | return -ENOSYS; | ||
320 | } | ||
321 | |||
322 | static void red_walk(struct Qdisc *sch, struct qdisc_walker *walker) | 311 | static void red_walk(struct Qdisc *sch, struct qdisc_walker *walker) |
323 | { | 312 | { |
324 | if (!walker->stop) { | 313 | if (!walker->stop) { |
@@ -336,8 +325,6 @@ static const struct Qdisc_class_ops red_class_ops = { | |||
336 | .leaf = red_leaf, | 325 | .leaf = red_leaf, |
337 | .get = red_get, | 326 | .get = red_get, |
338 | .put = red_put, | 327 | .put = red_put, |
339 | .change = red_change_class, | ||
340 | .delete = red_delete, | ||
341 | .walk = red_walk, | 328 | .walk = red_walk, |
342 | .dump = red_dump_class, | 329 | .dump = red_dump_class, |
343 | }; | 330 | }; |