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

nfp: 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.
No functional changes.

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

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d0ee0e62

drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c

+2 −20
Original line number Diff line number Diff line
@@ -1343,26 +1343,6 @@ static int nfp_net_set_coalesce(struct net_device *netdev, 
	struct nfp_net *nn = netdev_priv(netdev);

	unsigned int factor;



	if (ec->rx_coalesce_usecs_irq ||

	    ec->rx_max_coalesced_frames_irq ||

	    ec->tx_coalesce_usecs_irq ||

	    ec->tx_max_coalesced_frames_irq ||

	    ec->stats_block_coalesce_usecs ||

	    ec->use_adaptive_rx_coalesce ||

	    ec->use_adaptive_tx_coalesce ||

	    ec->pkt_rate_low ||

	    ec->rx_coalesce_usecs_low ||

	    ec->rx_max_coalesced_frames_low ||

	    ec->tx_coalesce_usecs_low ||

	    ec->tx_max_coalesced_frames_low ||

	    ec->pkt_rate_high ||

	    ec->rx_coalesce_usecs_high ||

	    ec->rx_max_coalesced_frames_high ||

	    ec->tx_coalesce_usecs_high ||

	    ec->tx_max_coalesced_frames_high ||

	    ec->rate_sample_interval)

		return -EOPNOTSUPP;



	/* Compute factor used to convert coalesce '_usecs' parameters to

	 * ME timestamp ticks.  There are 16 ME clock cycles for each timestamp

	 * count.
@@ -1476,6 +1456,8 @@ static int nfp_net_set_channels(struct net_device *netdev, 
}



static const struct ethtool_ops nfp_net_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_MAX_FRAMES,

	.get_drvinfo		= nfp_net_get_drvinfo,

	.get_link		= ethtool_op_get_link,

	.get_ringparam		= nfp_net_get_ringparam,