From: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Date: Sun, 26 Apr 2009 20:41:34 +0000 (+0000)
Subject: mlx4_en: Fix cleanup flow on cq activation
X-Git-Tag: v2.6.30-rc4~3^2~15
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a4233304bb43f87f97fc2ac9143b513814dcf094;p=~shefty%2Frdma-dev.git

mlx4_en: Fix cleanup flow on cq activation

In case of mlx4_en_activate_cq() failure, the cleanup
code would go to rx_err and try to disable unactivated rings.

Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/mlx4/en_netdev.c b/drivers/net/mlx4/en_netdev.c
index 438678ab2a1..7bcc49de163 100644
--- a/drivers/net/mlx4/en_netdev.c
+++ b/drivers/net/mlx4/en_netdev.c
@@ -583,7 +583,7 @@ int mlx4_en_start_port(struct net_device *dev)
 		err = mlx4_en_activate_cq(priv, cq);
 		if (err) {
 			mlx4_err(mdev, "Failed activating Rx CQ\n");
-			goto rx_err;
+			goto cq_err;
 		}
 		for (j = 0; j < cq->size; j++)
 			cq->buf[j].owner_sr_opcode = MLX4_CQE_OWNER_MASK;