diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-03 20:24:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-03 20:24:08 -0400 |
| commit | 8800cea62025a5209d110c5fa5990429239d6eee (patch) | |
| tree | 2aa9e4732d7014dcda4c0e80d2e377f52e2262e9 /include/net/pkt_sched.h | |
| parent | 84e48b6d64fdc29586bc7d9329f986cdae591a80 (diff) | |
| parent | 14d50e78f947d340066ee0465dd892ad1d9162c0 (diff) | |
Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git/
Diffstat (limited to 'include/net/pkt_sched.h')
| -rw-r--r-- | include/net/pkt_sched.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h index 7352e455053c..fcb05a387dbe 100644 --- a/include/net/pkt_sched.h +++ b/include/net/pkt_sched.h | |||
| @@ -157,7 +157,8 @@ psched_tod_diff(int delta_sec, int bound) | |||
| 157 | case 1: \ | 157 | case 1: \ |
| 158 | __delta += 1000000; \ | 158 | __delta += 1000000; \ |
| 159 | case 0: \ | 159 | case 0: \ |
| 160 | __delta = abs(__delta); \ | 160 | if (__delta > bound || __delta < 0) \ |
| 161 | __delta = bound; \ | ||
| 161 | } \ | 162 | } \ |
| 162 | __delta; \ | 163 | __delta; \ |
| 163 | }) | 164 | }) |