projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cece194
)
pkt_sched: Fix sch_sfq vs tcf_bind_filter oops
author
Jarek Poplawski
<
[email protected]
>
Fri, 6 Aug 2010 00:22:35 +0000
(
00:22
+0000)
committer
David S. Miller
<
[email protected]
>
Sun, 8 Aug 2010 05:45:41 +0000
(22:45 -0700)
Since there was added ->tcf_chain() method without ->bind_tcf() to
sch_sfq class options, there is oops when a filter is added with
the classid parameter.
Fixes commit
7d2681a6ff4f9ab5e48d02550b4c6338f1638998
netdev thread: null pointer at cls_api.c
Signed-off-by: Jarek Poplawski <
[email protected]
>
Reported-by: Franchoze Eric <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
net/sched/sch_sfq.c
patch
|
blob
|
history
diff --git
a/net/sched/sch_sfq.c
b/net/sched/sch_sfq.c
index e85352b5c88d107d0fb5721c6da3683984c6dc54..534f33231c17d83593f124fa62d110d630c2fc0d 100644
(file)
--- a/
net/sched/sch_sfq.c
+++ b/
net/sched/sch_sfq.c
@@
-513,6
+513,12
@@
static unsigned long sfq_get(struct Qdisc *sch, u32 classid)
return 0;
}
+static unsigned long sfq_bind(struct Qdisc *sch, unsigned long parent,
+ u32 classid)
+{
+ return 0;
+}
+
static struct tcf_proto **sfq_find_tcf(struct Qdisc *sch, unsigned long cl)
{
struct sfq_sched_data *q = qdisc_priv(sch);
@@
-567,6
+573,7
@@
static void sfq_walk(struct Qdisc *sch, struct qdisc_walker *arg)
static const struct Qdisc_class_ops sfq_class_ops = {
.get = sfq_get,
.tcf_chain = sfq_find_tcf,
+ .bind_tcf = sfq_bind,
.dump = sfq_dump_class,
.dump_stats = sfq_dump_class_stats,
.walk = sfq_walk,