diff options
| author | Jarek Poplawski <jarkao2@gmail.com> | 2010-08-06 00:22:35 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-26 16:46:00 -0700 |
| commit | 0ff3da3bc0827cbc60d9ef37ac26d72814125fa6 (patch) | |
| tree | 12d6db47b3b309fb3a03f6730b8b32ceed57110b /net | |
| parent | 4c0ef2f2c0ef4245486124b84ba0ec9a2b4b3899 (diff) | |
| download | kernel-common-0ff3da3bc0827cbc60d9ef37ac26d72814125fa6.tar.gz kernel-common-0ff3da3bc0827cbc60d9ef37ac26d72814125fa6.tar.bz2 kernel-common-0ff3da3bc0827cbc60d9ef37ac26d72814125fa6.zip | |
pkt_sched: Fix sch_sfq vs tcf_bind_filter oops
[ Upstream commit eb4a5527b1f0d581ac217c80ef3278ed5e38693c ]
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 <jarkao2@gmail.com>
Reported-by: Franchoze Eric <franchoze@yandex.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sched/sch_sfq.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c index c65762823f5e..9ba71ba0f8f0 100644 --- a/net/sched/sch_sfq.c +++ b/net/sched/sch_sfq.c @@ -502,6 +502,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); @@ -556,6 +562,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, |