diff options
| author | David S. Miller <davem@davemloft.net> | 2017-05-09 18:22:48 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-09 18:22:48 +0300 |
| commit | cf680179c111b1901e83bdd53997fb09dafff967 (patch) | |
| tree | f0bd6c0d814a9a095f7738f609d5a6d6f37d0acc /drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | |
| parent | 4c19e2f2a86f2281014c1e06785715ad9864c9cc (diff) | |
| parent | 83bd5118a119cabba47e194bba96641e303aadff (diff) | |
| download | linux-cf680179c111b1901e83bdd53997fb09dafff967.tar.xz | |
Merge branch 'mlx4-misc-fixes'
Tariq Toukan says:
====================
mlx4 misc fixes
This patchset contains misc bug fixes from the team
to the mlx4 Core and Eth drivers.
Series generated against net commit:
32f1bc0f3d26 Revert "ipv4: restore rt->fi for reference counting"
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/resource_tracker.c')
| -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 4aa29ee93013..07516545474f 100644 --- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c @@ -311,7 +311,7 @@ static inline int mlx4_grant_resource(struct mlx4_dev *dev, int slave, struct mlx4_priv *priv = mlx4_priv(dev); struct resource_allocator *res_alloc = &priv->mfunc.master.res_tracker.res_alloc[res_type]; - int err = -EINVAL; + int err = -EDQUOT; int allocated, free, reserved, guaranteed, from_free; int from_rsvd; |