From 454f9bb1e2b364b9b8369d62e154820646adaa15 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Tue, 30 Apr 2013 10:53:51 +0000 Subject: [PATCH] --- yaml --- r: 369905 b: refs/heads/master c: fe86d714168f1567989c309f73a3550022686301 h: refs/heads/master i: 369903: c510b4c8f8bad8c5fc06f462871fa1a5b0a6f9d3 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/mellanox/mlx4/en_clock.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 859b9146e4c8..1366067ddacc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97cd1ee6ef24eadf42bb199ab20bdc07cf919939 +refs/heads/master: fe86d714168f1567989c309f73a3550022686301 diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/en_clock.c b/trunk/drivers/net/ethernet/mellanox/mlx4/en_clock.c index 2f181219662e..fd6441071319 100644 --- a/trunk/drivers/net/ethernet/mellanox/mlx4/en_clock.c +++ b/trunk/drivers/net/ethernet/mellanox/mlx4/en_clock.c @@ -114,6 +114,7 @@ void mlx4_en_fill_hwtstamps(struct mlx4_en_dev *mdev, void mlx4_en_init_timestamp(struct mlx4_en_dev *mdev) { struct mlx4_dev *dev = mdev->dev; + u64 ns; memset(&mdev->cycles, 0, sizeof(mdev->cycles)); mdev->cycles.read = mlx4_en_read_clock; @@ -133,10 +134,9 @@ void mlx4_en_init_timestamp(struct mlx4_en_dev *mdev) /* Calculate period in seconds to call the overflow watchdog - to make * sure counter is checked at least once every wrap around. */ - mdev->overflow_period = - (cyclecounter_cyc2ns(&mdev->cycles, - mdev->cycles.mask) / NSEC_PER_SEC / 2) - * HZ; + ns = cyclecounter_cyc2ns(&mdev->cycles, mdev->cycles.mask); + do_div(ns, NSEC_PER_SEC / 2 / HZ); + mdev->overflow_period = ns; } void mlx4_en_ptp_overflow_check(struct mlx4_en_dev *mdev)