Commit 1c31cb92 authored by Maxim Mikityanskiy's avatar Maxim Mikityanskiy Committed by Saeed Mahameed
Browse files

net/mlx5e: Move the LRO-XSK check to mlx5e_fix_features 



LRO is mutually exclusive with XSK. When LRO is enabled, it checks
whether XSK is active. This commit moves this check to a more correct
place at mlx5e_fix_features.

Signed-off-by: default avatarMaxim Mikityanskiy <maximmi@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent f7434ba0

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+5 −7
Original line number Diff line number Diff line
@@ -3594,13 +3594,6 @@ static int set_feature_lro(struct net_device *netdev, bool enable) 


	mutex_lock(&priv->state_lock);



	if (enable && priv->xsk.refcnt) {

		netdev_warn(netdev, "LRO is incompatible with AF_XDP (%u XSKs are active)\n",

			    priv->xsk.refcnt);

		err = -EINVAL;

		goto out;

	}



	cur_params = &priv->channels.params;

	if (enable && !MLX5E_GET_PFLAG(cur_params, MLX5E_PFLAG_RX_STRIDING_RQ)) {

		netdev_warn(netdev, "can't set LRO with legacy RQ\n");
@@ -3916,6 +3909,11 @@ static netdev_features_t mlx5e_fix_features(struct net_device *netdev, 
	}



	if (priv->xsk.refcnt) {

		if (features & NETIF_F_LRO) {

			netdev_warn(netdev, "LRO is incompatible with AF_XDP (%u XSKs are active)\n",

				    priv->xsk.refcnt);

			features &= ~NETIF_F_LRO;

		}

		if (features & NETIF_F_GRO_HW) {

			netdev_warn(netdev, "HW GRO is incompatible with AF_XDP (%u XSKs are active)\n",

				    priv->xsk.refcnt);