Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6efb5fac authored by Hadar Hen Zion's avatar Hadar Hen Zion Committed by David S. Miller
Browse files

net/mlx4_en: Remove ethtool flow steering rules before releasing QPs 



Fix the ethtool flow steering rules cleanup to be carried out before
releasing the RX QPs.

Signed-off-by: default avatarHadar Hen Zion <hadarh@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 80cb0021

drivers/net/ethernet/mellanox/mlx4/en_netdev.c

+11 −11
Original line number Diff line number Diff line
@@ -1637,6 +1637,17 @@ void mlx4_en_stop_port(struct net_device *dev, int detach) 
	/* Flush multicast filter */

	mlx4_SET_MCAST_FLTR(mdev->dev, priv->port, 0, 1, MLX4_MCAST_CONFIG);



	/* Remove flow steering rules for the port*/

	if (mdev->dev->caps.steering_mode ==

	    MLX4_STEERING_MODE_DEVICE_MANAGED) {

		ASSERT_RTNL();

		list_for_each_entry_safe(flow, tmp_flow,

					 &priv->ethtool_list, list) {

			mlx4_flow_detach(mdev->dev, flow->id);

			list_del(&flow->list);

		}

	}



	mlx4_en_destroy_drop_qp(priv);



	/* Free TX Rings */
@@ -1657,17 +1668,6 @@ void mlx4_en_stop_port(struct net_device *dev, int detach) 
	if (!(mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAGS2_REASSIGN_MAC_EN))

		mdev->mac_removed[priv->port] = 1;



	/* Remove flow steering rules for the port*/

	if (mdev->dev->caps.steering_mode ==

	    MLX4_STEERING_MODE_DEVICE_MANAGED) {

		ASSERT_RTNL();

		list_for_each_entry_safe(flow, tmp_flow,

					 &priv->ethtool_list, list) {

			mlx4_flow_detach(mdev->dev, flow->id);

			list_del(&flow->list);

		}

	}



	/* Free RX Rings */

	for (i = 0; i < priv->rx_ring_num; i++) {

		mlx4_en_deactivate_rx_ring(priv, &priv->rx_ring[i]);