diff mbox

[net-next] drivers/net: fix unresolved 64bit math in mellanox/mlx4/en_dcb_nl.c

Message ID 1334545794-16703-1-git-send-email-paul.gortmaker@windriver.com
State Changes Requested, archived
Delegated to: David Miller
Headers show

Commit Message

Paul Gortmaker April 16, 2012, 3:09 a.m. UTC
Commit 109d2446052a484c58f07f71f9457bf7b71017f8

    "net/mlx4_en: Set max rate-limit for a TC"

introduced 64 bit math operations into mlx4_en_dcbnl_ieee_setmaxrate()

causing the following final link failure on an x86_32 allmodconfig

  ERROR: "__udivdi3" [drivers/net/ethernet/mellanox/mlx4/mlx4_en.ko] undefined!

Convert it to use div_u64() instead.

Cc: Amir Vadai <amirv@mellanox.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---

[seen in linux-next: http://kisskb.ellerman.id.au/kisskb/buildresult/6091475/]

Comments

David Miller April 16, 2012, 3:31 a.m. UTC | #1
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Sun, 15 Apr 2012 23:09:54 -0400

> Commit 109d2446052a484c58f07f71f9457bf7b71017f8
> 
>     "net/mlx4_en: Set max rate-limit for a TC"
> 
> introduced 64 bit math operations into mlx4_en_dcbnl_ieee_setmaxrate()
> 
> causing the following final link failure on an x86_32 allmodconfig
> 
>   ERROR: "__udivdi3" [drivers/net/ethernet/mellanox/mlx4/mlx4_en.ko] undefined!
> 
> Convert it to use div_u64() instead.
> 
> Cc: Amir Vadai <amirv@mellanox.com>
> Cc: David S. Miller <davem@davemloft.net>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

Please add an explicit linux/math64.h include here too, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c b/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
index 0cc6c96..720cb55 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
@@ -227,9 +227,9 @@  static int mlx4_en_dcbnl_ieee_setmaxrate(struct net_device *dev,
 		/* Convert from Kbps into HW units, rounding result up.
 		 * Setting to 0, means unlimited BW.
 		 */
-		tmp[i] =
-			(maxrate->tc_maxrate[i] + MLX4_RATELIMIT_UNITS_IN_KB -
-			 1) / MLX4_RATELIMIT_UNITS_IN_KB;
+		tmp[i] = div_u64(maxrate->tc_maxrate[i] +
+				 MLX4_RATELIMIT_UNITS_IN_KB - 1,
+				 MLX4_RATELIMIT_UNITS_IN_KB);
 	}
 
 	err = mlx4_en_config_port_scheduler(priv, NULL, tmp);