From a4be026f106b7baa9cbb4dfa98c51042b6fdb49c Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Sat, 1 Aug 2009 22:48:45 +0000
Subject: [PATCH] --- yaml --- r: 159305 b: refs/heads/master c:
 8b97c7c283c5ba8f9f4dabd418fd7dcfcc8a387e h: refs/heads/master i:   159303:
 5ec18967293cf6b5d8384e396c27a9b0d6a25e06 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/atm/horizon.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4f4bb9d465d6..5774c1a3495f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39506a552b4b302540e1f9c6c93a122df353e57d
+refs/heads/master: 8b97c7c283c5ba8f9f4dabd418fd7dcfcc8a387e
diff --git a/trunk/drivers/atm/horizon.c b/trunk/drivers/atm/horizon.c
index 6b969f8c684f..01ce241dbeae 100644
--- a/trunk/drivers/atm/horizon.c
+++ b/trunk/drivers/atm/horizon.c
@@ -641,7 +641,7 @@ static int make_rate (const hrz_dev * dev, u32 c, rounding r,
 					pre = 1;
 				break;
 			case round_nearest:
-				pre = (br+(c<<div)/2)/(c<<div);
+				pre = DIV_ROUND_CLOSEST(br, c<<div);
 				// but p must be non-zero
 				if (!pre)
 					pre = 1;
@@ -671,7 +671,7 @@ static int make_rate (const hrz_dev * dev, u32 c, rounding r,
 					pre = DIV_ROUND_UP(br, c<<div);
 					break;
 				case round_nearest:
-					pre = (br+(c<<div)/2)/(c<<div);
+					pre = DIV_ROUND_CLOSEST(br, c<<div);
 					break;
 				default: /* round_up */
 					pre = br/(c<<div);