diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-06 11:58:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-06 11:58:24 -0400 |
| commit | cb3f1e7b835f6fe0fc09574381fe54daf6600001 (patch) | |
| tree | 80db1baa3e59b65a2bb2db833af8eb336459404f /include | |
| parent | 3e3183bab0257a6d02038658c53b491e1378612f (diff) | |
| parent | 558e10a57db10de355ee97712d2b6df49e9b7849 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[LAPB]: Fix windowsize check
[TCP]: Fixes IW > 2 cases when TCP is application limited
[PKT_SCHED] RED: Fix overflow in calculation of queue average
[LLX]: SOCK_DGRAM interface fixes
[PKT_SCHED]: Return ENOENT if qdisc module is unavailable
[BRIDGE]: netlink status fix
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/red.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/red.h b/include/net/red.h index 5ccdbb3d4722..a4eb37946f2c 100644 --- a/include/net/red.h +++ b/include/net/red.h | |||
| @@ -212,7 +212,7 @@ static inline unsigned long red_calc_qavg_from_idle_time(struct red_parms *p) | |||
| 212 | * Seems, it is the best solution to | 212 | * Seems, it is the best solution to |
| 213 | * problem of too coarse exponent tabulation. | 213 | * problem of too coarse exponent tabulation. |
| 214 | */ | 214 | */ |
| 215 | us_idle = (p->qavg * us_idle) >> p->Scell_log; | 215 | us_idle = (p->qavg * (u64)us_idle) >> p->Scell_log; |
| 216 | 216 | ||
| 217 | if (us_idle < (p->qavg >> 1)) | 217 | if (us_idle < (p->qavg >> 1)) |
| 218 | return p->qavg - us_idle; | 218 | return p->qavg - us_idle; |