OSDN Git Service

ionic: let core reject the unsupported coalescing parameters
authorJakub Kicinski <kuba@kernel.org>
Thu, 5 Mar 2020 05:15:36 +0000 (21:15 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 5 Mar 2020 20:12:35 +0000 (12:12 -0800)
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: Jakub Kicinski <kuba@kernel.org>
Acked-by: Shannon Nelson <snelson@pensando.io>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c

index f778fff..b3a113a 100644 (file)
@@ -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,