|
@@ -3001,9 +3001,8 @@ err_steer_free_bitmap:
|
|
|
kfree(ibdev->ib_uc_qpns_bitmap);
|
|
|
|
|
|
err_steer_qp_release:
|
|
|
- if (ibdev->steering_support == MLX4_STEERING_MODE_DEVICE_MANAGED)
|
|
|
- mlx4_qp_release_range(dev, ibdev->steer_qpn_base,
|
|
|
- ibdev->steer_qpn_count);
|
|
|
+ mlx4_qp_release_range(dev, ibdev->steer_qpn_base,
|
|
|
+ ibdev->steer_qpn_count);
|
|
|
err_counter:
|
|
|
for (i = 0; i < ibdev->num_ports; ++i)
|
|
|
mlx4_ib_delete_counters_table(ibdev, &ibdev->counters_table[i]);
|
|
@@ -3108,11 +3107,9 @@ static void mlx4_ib_remove(struct mlx4_dev *dev, void *ibdev_ptr)
|
|
|
ibdev->iboe.nb.notifier_call = NULL;
|
|
|
}
|
|
|
|
|
|
- if (ibdev->steering_support == MLX4_STEERING_MODE_DEVICE_MANAGED) {
|
|
|
- mlx4_qp_release_range(dev, ibdev->steer_qpn_base,
|
|
|
- ibdev->steer_qpn_count);
|
|
|
- kfree(ibdev->ib_uc_qpns_bitmap);
|
|
|
- }
|
|
|
+ mlx4_qp_release_range(dev, ibdev->steer_qpn_base,
|
|
|
+ ibdev->steer_qpn_count);
|
|
|
+ kfree(ibdev->ib_uc_qpns_bitmap);
|
|
|
|
|
|
iounmap(ibdev->uar_map);
|
|
|
for (p = 0; p < ibdev->num_ports; ++p)
|