From: Eugenia Emantayev Date: Wed, 6 Feb 2013 14:26:56 +0000 (+0200) Subject: mlx4_core: move out label to the right place X-Git-Tag: v4.1.12-92~293^2~1^2~89 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8a45218854512936bdeecc5521f30d38437e5ec0;p=users%2Fjedix%2Flinux-maple.git mlx4_core: move out label to the right place Add new steering entry for good flow only. Signed-off-by: Eugenia Emantayev (Ported from Mellanox OFED 2.4) Signed-off-by: Mukesh Kacker --- diff --git a/drivers/net/ethernet/mellanox/mlx4/mcg.c b/drivers/net/ethernet/mellanox/mlx4/mcg.c index bd9ea0d01aae..643ce64dd748 100644 --- a/drivers/net/ethernet/mellanox/mlx4/mcg.c +++ b/drivers/net/ethernet/mellanox/mlx4/mcg.c @@ -1180,7 +1180,6 @@ int mlx4_qp_attach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16], if (err) goto out; -out: if (prot == MLX4_PROT_ETH) { /* manage the steering entry for promisc mode */ if (new_entry) @@ -1189,6 +1188,8 @@ out: existing_steering_entry(dev, port, steer, index, qp->qpn); } + +out: if (err && link && index != -1) { if (index < dev->caps.num_mgms) mlx4_warn(dev, "Got AMGM index %d < %d\n",