From 800e3acafffd3eb5ce2f548d93ea4f6eef9e67b8 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Sat, 1 Aug 2009 21:50:31 +0200
Subject: [PATCH] --- yaml --- r: 159391 b: refs/heads/master c:
 87cdb9894b9367237f25e5a4c381eb8e594e782b h: refs/heads/master i:   159389:
 86284e17414d874eac3707b5d53247f8fd4c576a   159387:
 b0e20cff545bb7184aad3469bafaabaeac3a8eac   159383:
 40905dcc03a3f9a583c29f19a9dda3546be0417a   159375:
 3e4db04a6e7cf5845a6eb23376d82520bb4d0c81   159359:
 a80d9acf0cb81654fb7a9c2544ef465fe9cea402 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/wireless/strip.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9b3d454f6737..a99ead3aea37 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c8d51048f6a54aabe2e15278210cb07288e17bb
+refs/heads/master: 87cdb9894b9367237f25e5a4c381eb8e594e782b
diff --git a/trunk/drivers/net/wireless/strip.c b/trunk/drivers/net/wireless/strip.c
index 73300c226f67..ef2cb20e96ad 100644
--- a/trunk/drivers/net/wireless/strip.c
+++ b/trunk/drivers/net/wireless/strip.c
@@ -1550,9 +1550,12 @@ static int strip_xmit(struct sk_buff *skb, struct net_device *dev)
 
 	if (time_after(jiffies, strip_info->pps_timer + HZ)) {
 		unsigned long t = jiffies - strip_info->pps_timer;
-		unsigned long rx_pps_count = (strip_info->rx_pps_count * HZ * 8 + t / 2) / t;
-		unsigned long tx_pps_count = (strip_info->tx_pps_count * HZ * 8 + t / 2) / t;
-		unsigned long sx_pps_count = (strip_info->sx_pps_count * HZ * 8 + t / 2) / t;
+		unsigned long rx_pps_count =
+			DIV_ROUND_CLOSEST(strip_info->rx_pps_count*HZ*8, t);
+		unsigned long tx_pps_count =
+			DIV_ROUND_CLOSEST(strip_info->tx_pps_count*HZ*8, t);
+		unsigned long sx_pps_count =
+			DIV_ROUND_CLOSEST(strip_info->sx_pps_count*HZ*8, t);
 
 		strip_info->pps_timer = jiffies;
 		strip_info->rx_pps_count = 0;