Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Just minor overlapping changes in the conflicts here.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/dim/dim.c b/lib/dim/dim.c
index 439d641ec796..38045d6d0538 100644
--- a/lib/dim/dim.c
+++ b/lib/dim/dim.c
@@ -74,8 +74,8 @@ void dim_calc_stats(struct dim_sample *start, struct dim_sample *end,
                                         delta_us);
         curr_stats->cpms = DIV_ROUND_UP(ncomps * USEC_PER_MSEC, delta_us);
         if (curr_stats->epms != 0)
-                curr_stats->cpe_ratio =
-                                (curr_stats->cpms * 100) / curr_stats->epms;
+                curr_stats->cpe_ratio = DIV_ROUND_DOWN_ULL(
+                        curr_stats->cpms * 100, curr_stats->epms);
         else
                 curr_stats->cpe_ratio = 0;