summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorJack Morgenstein <jackm@dev.mellanox.co.il>2012-03-07 05:56:35 +0000
committerDavid S. Miller <davem@davemloft.net>2012-03-08 00:28:01 -0800
commitdcf353b17007841f91e1735e33790508c84c9ad0 (patch)
treec7733dca7ad0bd49b37660160be857b04bec0b84 /drivers/net
parent783154573236f46b730b2eea17d2e6e04bdb3251 (diff)
downloadlinux-3.10-dcf353b17007841f91e1735e33790508c84c9ad0.tar.gz
linux-3.10-dcf353b17007841f91e1735e33790508c84c9ad0.tar.bz2
linux-3.10-dcf353b17007841f91e1735e33790508c84c9ad0.zip
mlx4_core: fix bug in modify_cq wrapper for resize flow.
The actual FW command is called in procedure "handle_resize". Code incorrectly invoked the FW command again (in good flow), in the modify_cq wrapper function. Fix by skipping second FW invocation unconditionally for resize. Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/mellanox/mlx4/resource_tracker.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index bfdb7af19e4..8752e6e0816 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -2255,8 +2255,7 @@ int mlx4_MODIFY_CQ_wrapper(struct mlx4_dev *dev, int slave,
if (vhcr->op_modifier == 0) {
err = handle_resize(dev, slave, vhcr, inbox, outbox, cmd, cq);
- if (err)
- goto ex_put;
+ goto ex_put;
}
err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);