net/mlx5e: IPoIB, Improve ethtool rxnfc callback structure in IPoIB

Followup commit
79ce39be1d63 ("net/mlx5e: Improve ethtool rxnfc callback structure")
and handle CONFIG_MLX5_EN_RXNFC enabled/disabled inside the fs layer so
the ethtool callbacks are always available. The fs layer will provide
stubs when CONFIG_MLX5_EN_RXNFC is compiled out.

Signed-off-by: Gal Pressman <gal@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c
index f4f7eaf16446f46f07f3e2b73fabd2464345054d..8da73ef5680f6ecbab213f8aa06b0ac4cbb4f901 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c
@@ -221,7 +221,6 @@ static int mlx5i_get_link_ksettings(struct net_device *netdev,
        return 0;
 }
 
-#ifdef CONFIG_MLX5_EN_RXNFC
 static u32 mlx5i_flow_type_mask(u32 flow_type)
 {
        return flow_type & ~(FLOW_EXT | FLOW_MAC_EXT | FLOW_RSS);
@@ -243,9 +242,18 @@ static int mlx5i_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info,
 {
        struct mlx5e_priv *priv = mlx5i_epriv(dev);
 
+       /* ETHTOOL_GRXRINGS is needed by ethtool -x which is not part
+        * of rxnfc. We keep this logic out of mlx5e_ethtool_get_rxnfc,
+        * to avoid breaking "ethtool -x" when mlx5e_ethtool_get_rxnfc
+        * is compiled out via CONFIG_MLX5_EN_RXNFC=n.
+        */
+       if (info->cmd == ETHTOOL_GRXRINGS) {
+               info->data = priv->channels.params.num_channels;
+               return 0;
+       }
+
        return mlx5e_ethtool_get_rxnfc(priv, info, rule_locs);
 }
-#endif
 
 const struct ethtool_ops mlx5i_ethtool_ops = {
        .supported_coalesce_params = ETHTOOL_COALESCE_USECS |
@@ -263,10 +271,8 @@ const struct ethtool_ops mlx5i_ethtool_ops = {
        .get_coalesce       = mlx5i_get_coalesce,
        .set_coalesce       = mlx5i_set_coalesce,
        .get_ts_info        = mlx5i_get_ts_info,
-#ifdef CONFIG_MLX5_EN_RXNFC
        .get_rxnfc          = mlx5i_get_rxnfc,
        .set_rxnfc          = mlx5i_set_rxnfc,
-#endif
        .get_link_ksettings = mlx5i_get_link_ksettings,
        .get_link           = ethtool_op_get_link,
 };