OSDN Git Service

vmxnet3: let core reject the unsupported coalescing parameters
authorJakub Kicinski <kuba@kernel.org>
Fri, 6 Mar 2020 01:06:00 +0000 (17:06 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 7 Mar 2020 06:45:55 +0000 (22:45 -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.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/vmxnet3/vmxnet3_ethtool.c

index 1e4b9ba..6528940 100644 (file)
@@ -780,27 +780,6 @@ vmxnet3_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *ec)
        if (!VMXNET3_VERSION_GE_3(adapter))
                return -EOPNOTSUPP;
 
-       if (ec->rx_coalesce_usecs_irq ||
-           ec->rx_max_coalesced_frames_irq ||
-           ec->tx_coalesce_usecs ||
-           ec->tx_coalesce_usecs_irq ||
-           ec->tx_max_coalesced_frames_irq ||
-           ec->stats_block_coalesce_usecs ||
-           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 -EINVAL;
-       }
-
        if ((ec->rx_coalesce_usecs == 0) &&
            (ec->use_adaptive_rx_coalesce == 0) &&
            (ec->tx_max_coalesced_frames == 0) &&
@@ -891,6 +870,9 @@ done:
 }
 
 static const struct ethtool_ops vmxnet3_ethtool_ops = {
+       .supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS |
+                                    ETHTOOL_COALESCE_MAX_FRAMES |
+                                    ETHTOOL_COALESCE_USE_ADAPTIVE_RX,
        .get_drvinfo       = vmxnet3_get_drvinfo,
        .get_regs_len      = vmxnet3_get_regs_len,
        .get_regs          = vmxnet3_get_regs,