diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2004-12-08 04:35:33 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2004-12-08 04:35:33 -0800 |
| commit | 24e5f922a53dc1e53278904bd832ac52432b8e33 (patch) | |
| tree | 81e4e0f31f0c4c4dbddd004c551c22bddd658dcf /net | |
| parent | 38a99497d787278a1332116c949018a96685a2d9 (diff) | |
| download | history-24e5f922a53dc1e53278904bd832ac52432b8e33.tar.gz | |
[PKT_SCHED]: netem forgets to restart device after inserting packets
The version of netem in 2.6.10 moves packets from the delayed queue
to the qdisc in a timer interrupt. But it forgot to force the device to
pick them up.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sched/sch_netem.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index 4627b8af94b3e6..e56c83e6c3800d 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -258,12 +258,13 @@ static void netem_watchdog(unsigned long arg) { struct Qdisc *sch = (struct Qdisc *)arg; struct netem_sched_data *q = qdisc_priv(sch); + struct net_device *dev = sch->dev; struct sk_buff *skb; psched_time_t now; pr_debug("netem_watchdog: fired @%lu\n", jiffies); - spin_lock_bh(&sch->dev->queue_lock); + spin_lock_bh(&dev->queue_lock); PSCHED_GET_TIME(now); while ((skb = skb_peek(&q->delayed)) != NULL) { @@ -286,7 +287,8 @@ static void netem_watchdog(unsigned long arg) else sch->q.qlen++; } - spin_unlock_bh(&sch->dev->queue_lock); + qdisc_restart(dev); + spin_unlock_bh(&dev->queue_lock); } static void netem_reset(struct Qdisc *sch) |