summaryrefslogtreecommitdiffstats
path: root/net/sched
diff options
context:
space:
mode:
authorWANG Cong <xiyou.wangcong@gmail.com>2014-10-25 01:55:58 +0200
committerDavid S. Miller <davem@davemloft.net>2014-10-29 19:28:01 +0100
commitd56109020d93337545dd257a790cb429a70acfad (patch)
tree42b64ba14827500ddf1e52ec24209d5dcbba2fbe /net/sched
parentMerge branch 'cdc-ether' (diff)
downloadlinux-d56109020d93337545dd257a790cb429a70acfad.tar.xz
linux-d56109020d93337545dd257a790cb429a70acfad.zip
sch_pie: schedule the timer after all init succeed
Cc: Vijay Subramanian <vijaynsu@cisco.com> Cc: David S. Miller <davem@davemloft.net> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Acked-by: Eric Dumazet <edumazet@google.com>
Diffstat (limited to 'net/sched')
-rw-r--r--net/sched/sch_pie.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_pie.c b/net/sched/sch_pie.c
index 33d7a98a7a97..b783a446d884 100644
--- a/net/sched/sch_pie.c
+++ b/net/sched/sch_pie.c
@@ -445,7 +445,6 @@ static int pie_init(struct Qdisc *sch, struct nlattr *opt)
sch->limit = q->params.limit;
setup_timer(&q->adapt_timer, pie_timer, (unsigned long)sch);
- mod_timer(&q->adapt_timer, jiffies + HZ / 2);
if (opt) {
int err = pie_change(sch, opt);
@@ -454,6 +453,7 @@ static int pie_init(struct Qdisc *sch, struct nlattr *opt)
return err;
}
+ mod_timer(&q->adapt_timer, jiffies + HZ / 2);
return 0;
}