diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-13 19:35:03 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-13 19:35:03 -0800 |
| commit | 2da994e687f7991cc76e3270c423bf6500b9424a (patch) | |
| tree | 437d685035c2a39395f14c233831422ed636c016 /net/sched/sch_red.c | |
| parent | 00e929808a1cb410f45a620c0fc79d8d0a2506b1 (diff) | |
| parent | db33f4de9952af112b0d4f2436ce931ae632aba0 (diff) | |
Merge branch 'orion/devel' into next/devel
Diffstat (limited to 'net/sched/sch_red.c')
| -rw-r--r-- | net/sched/sch_red.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c index 6649463da1b..d617161f8dd 100644 --- a/net/sched/sch_red.c +++ b/net/sched/sch_red.c @@ -209,8 +209,8 @@ static int red_change(struct Qdisc *sch, struct nlattr *opt) ctl->Plog, ctl->Scell_log, nla_data(tb[TCA_RED_STAB])); - if (skb_queue_empty(&sch->q)) - red_end_of_idle_period(&q->parms); + if (!q->qdisc->q.qlen) + red_start_of_idle_period(&q->parms); sch_tree_unlock(sch); return 0; |