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_ingress.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_ingress.c')
-rw-r--r-- | net/sched/sch_ingress.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c index ace7902b5097..a9e646bdb605 100644 --- a/net/sched/sch_ingress.c +++ b/net/sched/sch_ingress.c | |||
@@ -42,12 +42,6 @@ static void ingress_put(struct Qdisc *sch, unsigned long cl) | |||
42 | { | 42 | { |
43 | } | 43 | } |
44 | 44 | ||
45 | static int ingress_change(struct Qdisc *sch, u32 classid, u32 parent, | ||
46 | struct nlattr **tca, unsigned long *arg) | ||
47 | { | ||
48 | return 0; | ||
49 | } | ||
50 | |||
51 | static void ingress_walk(struct Qdisc *sch, struct qdisc_walker *walker) | 45 | static void ingress_walk(struct Qdisc *sch, struct qdisc_walker *walker) |
52 | { | 46 | { |
53 | return; | 47 | return; |
@@ -120,7 +114,6 @@ static const struct Qdisc_class_ops ingress_class_ops = { | |||
120 | .leaf = ingress_leaf, | 114 | .leaf = ingress_leaf, |
121 | .get = ingress_get, | 115 | .get = ingress_get, |
122 | .put = ingress_put, | 116 | .put = ingress_put, |
123 | .change = ingress_change, | ||
124 | .walk = ingress_walk, | 117 | .walk = ingress_walk, |
125 | .tcf_chain = ingress_find_tcf, | 118 | .tcf_chain = ingress_find_tcf, |
126 | .bind_tcf = ingress_bind_filter, | 119 | .bind_tcf = ingress_bind_filter, |