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

ionic: let core reject the unsupported coalescing parameters 



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

This driver correctly rejects all unsupported parameters.
As a side effect of these changes the error code for
unsupported params changes from EINVAL to EOPNOTSUPP.

v3: adjust commit message for new error code and member name

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Acked-by: default avatarShannon Nelson <snelson@pensando.io>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0e72ea19

drivers/net/ethernet/pensando/ionic/ionic_ethtool.c

+1 −22
Original line number Diff line number Diff line
@@ -412,28 +412,6 @@ static int ionic_set_coalesce(struct net_device *netdev, 
	unsigned int i;

	u32 coal;



	if (coalesce->rx_max_coalesced_frames ||

	    coalesce->rx_coalesce_usecs_irq ||

	    coalesce->rx_max_coalesced_frames_irq ||

	    coalesce->tx_max_coalesced_frames ||

	    coalesce->tx_coalesce_usecs_irq ||

	    coalesce->tx_max_coalesced_frames_irq ||

	    coalesce->stats_block_coalesce_usecs ||

	    coalesce->use_adaptive_rx_coalesce ||

	    coalesce->use_adaptive_tx_coalesce ||

	    coalesce->pkt_rate_low ||

	    coalesce->rx_coalesce_usecs_low ||

	    coalesce->rx_max_coalesced_frames_low ||

	    coalesce->tx_coalesce_usecs_low ||

	    coalesce->tx_max_coalesced_frames_low ||

	    coalesce->pkt_rate_high ||

	    coalesce->rx_coalesce_usecs_high ||

	    coalesce->rx_max_coalesced_frames_high ||

	    coalesce->tx_coalesce_usecs_high ||

	    coalesce->tx_max_coalesced_frames_high ||

	    coalesce->rate_sample_interval)

		return -EINVAL;



	ident = &lif->ionic->ident;

	if (ident->dev.intr_coal_div == 0) {

		netdev_warn(netdev, "bad HW value in dev.intr_coal_div = %d\n",
@@ -784,6 +762,7 @@ static int ionic_nway_reset(struct net_device *netdev) 
}



static const struct ethtool_ops ionic_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS,

	.get_drvinfo		= ionic_get_drvinfo,

	.get_regs_len		= ionic_get_regs_len,

	.get_regs		= ionic_get_regs,