From 564e3b9e7655ec2f6d43ab0e3c547fa1c7c37f60 Mon Sep 17 00:00:00 2001 From: Hadar Hen Zion Date: Thu, 21 Mar 2013 05:55:54 +0000 Subject: [PATCH] --- yaml --- r: 361829 b: refs/heads/master c: 1e3f7b324e46b772dec1bb6dd96ae745fc085401 h: refs/heads/master i: 361827: 70f528beedb7e357134562fe8a2dfa930bd9fd87 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 480bc0076c5a..caaf0e264b08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6efb5fac4d6b617972ab5a10bf67e0eba2c2d212 +refs/heads/master: 1e3f7b324e46b772dec1bb6dd96ae745fc085401 diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c index 0d1d9679179c..b0ccdb55ca46 100644 --- a/trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +++ b/trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c @@ -355,7 +355,7 @@ static int mpt_mask(struct mlx4_dev *dev) return dev->caps.num_mpts - 1; } -static void *find_res(struct mlx4_dev *dev, int res_id, +static void *find_res(struct mlx4_dev *dev, u64 res_id, enum mlx4_resource type) { struct mlx4_priv *priv = mlx4_priv(dev);