Commit 55808762 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

mlx5: reject unsupported coalescing params 



Set ethtool_ops->supported_coalesce_params to let
the core reject unsupported coalescing parameters.

This driver did not previously reject unsupported parameters.

v3: adjust commit message for new member name

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Acked-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f704d243

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

+3 −0
Original line number Diff line number Diff line
@@ -1965,6 +1965,9 @@ static int mlx5e_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd) 
}



const struct ethtool_ops mlx5e_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_MAX_FRAMES |

				     ETHTOOL_COALESCE_USE_ADAPTIVE,

	.get_drvinfo       = mlx5e_get_drvinfo,

	.get_link          = ethtool_op_get_link,

	.get_strings       = mlx5e_get_strings,

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

+6 −0
Original line number Diff line number Diff line
@@ -376,6 +376,9 @@ static int mlx5e_uplink_rep_set_link_ksettings(struct net_device *netdev, 
}



static const struct ethtool_ops mlx5e_rep_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_MAX_FRAMES |

				     ETHTOOL_COALESCE_USE_ADAPTIVE,

	.get_drvinfo	   = mlx5e_rep_get_drvinfo,

	.get_link	   = ethtool_op_get_link,

	.get_strings       = mlx5e_rep_get_strings,
@@ -392,6 +395,9 @@ static const struct ethtool_ops mlx5e_rep_ethtool_ops = { 
};



static const struct ethtool_ops mlx5e_uplink_rep_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_MAX_FRAMES |

				     ETHTOOL_COALESCE_USE_ADAPTIVE,

	.get_drvinfo	   = mlx5e_uplink_rep_get_drvinfo,

	.get_link	   = ethtool_op_get_link,

	.get_strings       = mlx5e_rep_get_strings,

drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c

+3 −0
Original line number Diff line number Diff line
@@ -235,6 +235,9 @@ static int mlx5i_get_link_ksettings(struct net_device *netdev, 
}



const struct ethtool_ops mlx5i_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_MAX_FRAMES |

				     ETHTOOL_COALESCE_USE_ADAPTIVE,

	.get_drvinfo        = mlx5i_get_drvinfo,

	.get_strings        = mlx5i_get_strings,

	.get_sset_count     = mlx5i_get_sset_count,