[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1334549854-16370-1-git-send-email-paul.gortmaker@windriver.com>
Date: Mon, 16 Apr 2012 00:17:34 -0400
From: Paul Gortmaker <paul.gortmaker@...driver.com>
To: netdev@...r.kernel.org
Cc: Paul Gortmaker <paul.gortmaker@...driver.com>,
Amir Vadai <amirv@...lanox.com>,
"David S. Miller" <davem@...emloft.net>
Subject: [PATCH v2 net-next] drivers/net: fix unresolved 64bit math in mellanox/mlx4/en_dcb_nl.c
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@...lanox.com>
Cc: David S. Miller <davem@...emloft.net>
Signed-off-by: Paul Gortmaker <paul.gortmaker@...driver.com>
---
[ v2: add an explicit linux/math64.h include as per davem req ]
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c b/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
index 0cc6c96..5d367958 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
@@ -32,6 +32,7 @@
*/
#include <linux/dcbnl.h>
+#include <linux/math64.h>
#include "mlx4_en.h"
@@ -227,9 +228,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);
--
1.7.9.1
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists