diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /net/sched | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/sch_generic.c | 2 | ||||
| -rw-r--r-- | net/sched/sch_tbf.c | 4 | ||||
| -rw-r--r-- | net/sched/sch_teql.c | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index d0c0539aa..7fa9ed975 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -513,7 +513,7 @@ void dev_shutdown(struct net_device *dev) } #endif BUG_TRAP(dev->qdisc_list == NULL); - BUG_TRAP(dev->watchdog_timer.prev == NULL); + BUG_TRAP(!timer_pending(&dev->watchdog_timer)); dev->qdisc_list = NULL; spin_unlock_bh(&dev->queue_lock); write_unlock(&qdisc_tree_lock); diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c index e2de156ab..061ef312a 100644 --- a/net/sched/sch_tbf.c +++ b/net/sched/sch_tbf.c @@ -232,9 +232,7 @@ tbf_dequeue(struct Qdisc* sch) if (delay == 0) delay = 1; - del_timer(&q->wd_timer); - q->wd_timer.expires = jiffies + delay; - add_timer(&q->wd_timer); + mod_timer(&q->wd_timer, jiffies+delay); } /* Maybe we have a shorter packet in the queue, diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c index f7fed6c84..7ea61ce5c 100644 --- a/net/sched/sch_teql.c +++ b/net/sched/sch_teql.c @@ -70,7 +70,6 @@ struct teql_master struct net_device dev; struct Qdisc *slaves; struct net_device_stats stats; - char name[IFNAMSIZ]; }; struct teql_sched_data @@ -469,11 +468,10 @@ int __init teql_init(void) rtnl_lock(); the_master.dev.priv = (void*)&the_master; - the_master.dev.name = (void*)&the_master.name; err = dev_alloc_name(&the_master.dev, "teql%d"); if (err < 0) return err; - memcpy(the_master.qops.id, the_master.name, IFNAMSIZ); + memcpy(the_master.qops.id, the_master.dev.name, IFNAMSIZ); the_master.dev.init = teql_master_init; err = register_netdevice(&the_master.dev); |