diff options
| author | Robb Manes | 2015-09-29 17:03:37 +0200 |
|---|---|---|
| committer | David S. Miller | 2015-09-30 06:14:01 +0200 |
| commit | 23860f103b53e764a3cbbf615d08f88362a28295 (patch) | |
| tree | 053317bd0077afb798f3b694c2ac0e416a5b774b /drivers/net/ethernet | |
| parent | dsa: mv88e6xxx: Enable forwarding for unknown to the CPU port (diff) | |
| download | kernel-qcow2-linux-23860f103b53e764a3cbbf615d08f88362a28295.tar.gz kernel-qcow2-linux-23860f103b53e764a3cbbf615d08f88362a28295.tar.xz kernel-qcow2-linux-23860f103b53e764a3cbbf615d08f88362a28295.zip | |
net/mlx4: Handle return codes in mlx4_qp_attach_common
Both new_steering_entry() and existing_steering_entry() return values
based on their success or failure, but currently they fall through
silently. This can make troubleshooting difficult, as we were unable
to tell which one of these two functions returned errors or
specifically what code was returned. This patch remedies that
situation by passing the return codes to err, which is returned by
mlx4_qp_attach_common() itself.
This also addresses a leak in the call to mlx4_bitmap_free() as well.
Signed-off-by: Robb Manes <rmanes@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/mcg.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/mcg.c b/drivers/net/ethernet/mellanox/mlx4/mcg.c index bd9ea0d01aae..1d4e2e054647 100644 --- a/drivers/net/ethernet/mellanox/mlx4/mcg.c +++ b/drivers/net/ethernet/mellanox/mlx4/mcg.c @@ -1184,10 +1184,11 @@ out: if (prot == MLX4_PROT_ETH) { /* manage the steering entry for promisc mode */ if (new_entry) - new_steering_entry(dev, port, steer, index, qp->qpn); + err = new_steering_entry(dev, port, steer, + index, qp->qpn); else - existing_steering_entry(dev, port, steer, - index, qp->qpn); + err = existing_steering_entry(dev, port, steer, + index, qp->qpn); } if (err && link && index != -1) { if (index < dev->caps.num_mgms) |