1 files changed, 5 insertions, 1 deletions

diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c
index 8fb8107ab188..0991c640cd3e 100644
--- a/net/sched/sch_tbf.c
+++ b/net/sched/sch_tbf.c
@@ -273,7 +273,11 @@ static int tbf_change(struct Qdisc* sch, struct nlattr *opt)
         if (max_size < 0)
                 goto done;
 
-        if (qopt->limit > 0) {
+        if (q->qdisc != &noop_qdisc) {
+                err = fifo_set_limit(q->qdisc, qopt->limit);
+                if (err)
+                        goto done;
+        } else if (qopt->limit > 0) {
                 child = fifo_create_dflt(sch, &bfifo_qdisc_ops, qopt->limit);
                 if (IS_ERR(child)) {
                         err = PTR_ERR(child);