diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /net/sched | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/sch_api.c | 4 | ||||
| -rw-r--r-- | net/sched/sch_csz.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index f2fb9e36f..f16638081 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -94,7 +94,7 @@ static int tclass_notify(struct sk_buff *oskb, struct nlmsghdr *n, ---enqueue enqueue returns number of enqueued packets i.e. this number is 1, - if packet was enqueued sucessfully and <1 if something (not + if packet was enqueued successfully and <1 if something (not necessary THIS packet) was dropped. Auxiliary routines: @@ -898,7 +898,7 @@ __initfunc(int psched_calibrate_clock(void)) stop = jiffies + HZ/10; PSCHED_GET_TIME(stamp); do_gettimeofday(&tv); - while (jiffies < stop) + while (time_before(jiffies, stop)) barrier(); PSCHED_GET_TIME(stamp1); do_gettimeofday(&tv1); diff --git a/net/sched/sch_csz.c b/net/sched/sch_csz.c index 207a1dd51..9bdc656c9 100644 --- a/net/sched/sch_csz.c +++ b/net/sched/sch_csz.c @@ -704,7 +704,7 @@ csz_dequeue(struct Qdisc* sch) } #ifdef CSZ_PLUS_TBF /* We are about to return no skb. - Schedule watchdog timer, if it occured because of shaping. + Schedule watchdog timer, if it occurred because of shaping. */ if (q->wd_expires) { unsigned long delay = PSCHED_US2JIFFIE(q->wd_expires); |