aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJarek Poplawski <jarkao2@gmail.com>2010-08-10 22:31:02 +0000
committerDavid S. Miller <davem@davemloft.net>2010-08-11 01:36:59 -0700
commit41065fba846e795b31b17e4dec01cb904d56c6cd (patch)
treefbe25b8223c1fe8d2abc1e21cb4eb37fdb5ed7dc /net
parent98a21ef0abb666eeb12cf67e60203befb07e4210 (diff)
downloadkernel_samsung_crespo-41065fba846e795b31b17e4dec01cb904d56c6cd.zip
kernel_samsung_crespo-41065fba846e795b31b17e4dec01cb904d56c6cd.tar.gz
kernel_samsung_crespo-41065fba846e795b31b17e4dec01cb904d56c6cd.tar.bz2
pkt_sched: Fix sch_sfq vs tc_modify_qdisc oops
sch_sfq as a classful qdisc needs the .leaf handler. Otherwise, there is an oops possible in tc_modify_qdisc()/check_loop(). Fixes commit 7d2681a6ff4f9ab5e48d02550b4c6338f1638998 Signed-off-by: Jarek Poplawski <jarkao2@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/sched/sch_sfq.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
index b8bcb20..201cbac 100644
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
@@ -508,6 +508,11 @@ nla_put_failure:
return -1;
}
+static struct Qdisc *sfq_leaf(struct Qdisc *sch, unsigned long arg)
+{
+ return NULL;
+}
+
static unsigned long sfq_get(struct Qdisc *sch, u32 classid)
{
return 0;
@@ -575,6 +580,7 @@ static void sfq_walk(struct Qdisc *sch, struct qdisc_walker *arg)
}
static const struct Qdisc_class_ops sfq_class_ops = {
+ .leaf = sfq_leaf,
.get = sfq_get,
.put = sfq_put,
.tcf_chain = sfq_find_tcf,