summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-08-06 10:22:42 +0400
committerGreg Kroah-Hartman <gregkh@suse.de>2006-08-06 10:22:42 +0400
commitc34c07d6946ec8969fa71ba03dbb95091f4eb9d3 (patch)
treecc3b2b288177e85d444380e9ed7e149028d04a31 /include
parentbce896984c59bcb0804e9eccc19163dccbff064b (diff)
parent558e10a57db10de355ee97712d2b6df49e9b7849 (diff)
downloadlinux-c34c07d6946ec8969fa71ba03dbb95091f4eb9d3.tar.xz
Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include')
-rw-r--r--include/net/red.h2
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)
* Seems, it is the best solution to
* problem of too coarse exponent tabulation.
*/
- us_idle = (p->qavg * us_idle) >> p->Scell_log;
+ us_idle = (p->qavg * (u64)us_idle) >> p->Scell_log;
if (us_idle < (p->qavg >> 1))
return p->qavg - us_idle;