diff options
| author | David S. Miller <davem@davemloft.net> | 2014-11-29 20:47:48 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-29 20:47:48 -0800 |
| commit | 60b7379dc5b1743427b031cca53e30860a38ada6 (patch) | |
| tree | c0462b8dd188861bd04f36dd31672b7446e35dd8 /drivers/net/ethernet/mellanox/mlx4 | |
| parent | a523a5ecc8c6ddceb8f783f600605553e5ad8963 (diff) | |
| parent | 7a5a4f978750756755dc839014e13d1b088ccc8e (diff) | |
| download | op-kernel-dev-60b7379dc5b1743427b031cca53e30860a38ada6.zip op-kernel-dev-60b7379dc5b1743427b031cca53e30860a38ada6.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c index d718ca0..16f617b 100644 --- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c @@ -1546,7 +1546,7 @@ static int qp_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd, switch (op) { case RES_OP_RESERVE: - count = get_param_l(&in_param); + count = get_param_l(&in_param) & 0xffffff; align = get_param_h(&in_param); err = mlx4_grant_resource(dev, slave, RES_QP, count, 0); if (err) |
