From 1cf811353a0c050fd5cf14370bb20e7d4f375959 Mon Sep 17 00:00:00 2001 From: Dotan Barak Date: Tue, 7 Aug 2007 11:18:52 +0300 Subject: [PATCH] --- yaml --- r: 67088 b: refs/heads/master c: 36ce10d3e849c2f9efa3fd647058de398ee276eb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/mlx4/cmd.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 158d97a3036c..76627cc5262e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 65d470b3ea52ee1402499d6fcb4632296452e5b1 +refs/heads/master: 36ce10d3e849c2f9efa3fd647058de398ee276eb diff --git a/trunk/drivers/net/mlx4/cmd.c b/trunk/drivers/net/mlx4/cmd.c index a9f31753661a..b540820e9c25 100644 --- a/trunk/drivers/net/mlx4/cmd.c +++ b/trunk/drivers/net/mlx4/cmd.c @@ -95,7 +95,7 @@ enum { }; enum { - GO_BIT_TIMEOUT = 10000 + GO_BIT_TIMEOUT_MSECS = 10000 }; struct mlx4_cmd_context { @@ -155,7 +155,7 @@ static int mlx4_cmd_post(struct mlx4_dev *dev, u64 in_param, u64 out_param, end = jiffies; if (event) - end += HZ * 10; + end += msecs_to_jiffies(GO_BIT_TIMEOUT_MSECS); while (cmd_pending(dev)) { if (time_after_eq(jiffies, end))